--- gigedit/trunk/src/gigedit/mainwindow.h	2019/02/16 19:13:37	3471
+++ gigedit/trunk/src/gigedit/mainwindow.h	2019/02/16 19:56:56	3472
@@ -59,9 +59,14 @@
 #include "dimregionchooser.h"
 #include "dimregionedit.h"
 #include "midirules.h"
+#ifdef GLIB_THREADS
 #ifndef OLD_THREADS
 #include <glibmm/threads.h>
 #endif
+#else
+#include <thread>
+#include <mutex>
+#endif
 #include "ManagedWindow.h"
 
 class MainWindow;
@@ -173,13 +178,18 @@
     LoaderSaverBase(const Glib::ustring filename, gig::File* gig);
 
 private:
+#ifdef GLIB_THREADS
     Glib::Threads::Thread* thread;
+    Glib::Threads::Mutex progressMutex;
+#else
+    std::thread thread;
+    std::mutex progressMutex;
+#endif
     void thread_function();
     virtual void thread_function_sub(gig::progress_t& progress) = 0;
     Glib::Dispatcher finished_dispatcher;
     Glib::Dispatcher progress_dispatcher;
     Glib::Dispatcher error_dispatcher;
-    Glib::Threads::Mutex progressMutex;
     float progress;
 };