workaround images not loading

rehdi93 · Oct 18, 2018 · 6455d6a · 6455d6a
1 parent a8e47a1
commit 6455d6a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Src/BRClib/RenderManager.cs b/Src/BRClib/RenderManager.cs
@@ -14,7 +14,6 @@
 using System.IO;
 using System.Diagnostics;
 using FrameSet = System.Collections.Concurrent.ConcurrentHashSet<int>;
-using Timer = System.Timers.Timer;
 using static BRClib.Global;
 
 namespace BRClib
@@ -49,7 +48,7 @@ public void StartAsync()
 
             _RunWorker = true;
             _Worker = new Thread(QLoop);
-            _Worker.Name = "Render queueing thread";
+            _Worker.Name = "Render queue thread";
             _Worker.Start();
         }
 

diff --git a/Src/BlenderRenderController_gtk/Program.cs b/Src/BlenderRenderController_gtk/Program.cs
@@ -9,13 +9,19 @@ static class Program
         [STAThread]
         static void Main()
         {
-            //string pstr = System.Configuration.ConfigurationManager.AppSettings["portable"];
-            //bool portable = bool.TryParse(pstr, out bool r) ? r : false;
+            var pstr = Environment.GetEnvironmentVariable("BRC_PORTABLE_MODE");
+            bool portable_mode = false;
+            bool.TryParse(pstr, out portable_mode);
+
+            Global.Init(portable_mode);
 
-            Global.Init(true); // TODO: Control portable mode
-            Environment.CurrentDirectory = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources");
             Application.Init();
 
+            // TODO: figure out a way to make GTK look for the images in the Resources dir.
+            // as a workaround, set the CWD to Resources dir
+            var resDir = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources");
+            Environment.CurrentDirectory = resDir;
+
             var app = new Application("org.BlenderRenderController", GLib.ApplicationFlags.None);
             app.Register(GLib.Cancellable.Current);