Merge branch 'unstable' into trackhat-ui

1 files changed, 8 insertions, 4 deletions

diff --git a/facetracknoir/main.cpp b/facetracknoir/main.cpp
index c92f6980..6d29e3b5 100644
--- a/facetracknoir/main.cpp
+++ b/facetracknoir/main.cpp
@@ -20,7 +20,7 @@ static void add_program_library_path()
     {
         char* p = _pgmptr;
         {
-            char path[MAX_PATH];
+            char path[MAX_PATH+1];
             strcpy(path, p);
             char* ptr = strrchr(path, '\\');
             if (ptr)
@@ -77,13 +77,17 @@ int main(int argc, char** argv)
 	if (use_profile)
         MainWindow::set_profile(profile);
     
-    MainWindow w;
+    auto w = std::make_shared<MainWindow>();
     
     if (use_profile)
-        w.startTracker();
+        w->startTracker();
 		
-    w.show();
+    w->show();
     app.exec();
 
+	// on MSVC crashes in atexit
+#ifdef _MSC_VER
+	TerminateProcess(GetCurrentProcess(), 0);
+#endif
     return 0;
 }