gui/main: rework forceful exit

- on MSVC, exit before destroying the window. Qt
  Creator plays nicer with that.

- otherwise, don't perform a forceful exit. it seems
  unnecessary. I'll play with Valgrind some more to
  verify this.

1 files changed, 6 insertions, 8 deletions

diff --git a/gui/main.cpp b/gui/main.cpp
index f4cf06af..a70abde2 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -185,20 +185,18 @@ main(int argc, char** argv)
        app.setQuitOnLastWindowClosed(false);
        app.exec();
 
+       // msvc crashes in Qt plugin system's dtor
+#if defined(_MSC_VER)
+       qDebug() << "exit: terminating";
+       TerminateProcess(GetCurrentProcess(), 0);
+#endif
+
        app.exit(0);
 
        qDebug() << "exit: window";
     }
     while (false);
 
-    // msvc crashes in some destructor
-#if defined(_MSC_VER)
-    qDebug() << "exit: terminating";
-    TerminateProcess(GetCurrentProcess(), 0);
-#else
-    // we have some atexit issues when not leaking bundles
-    _exit(0);
-#endif
     qDebug() << "exit: main()";
 
     return 0;