From 62c137157ed04d08e6bcc7a741bcdb046943776f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 17 Aug 2016 21:40:22 +0200 Subject: compat/win32-com: default to right COM type without caller specifying it The main window always needs the apartment threaded context for OLE used by Qt. Default to apartment threaded before a QApplication is created, or if the thread is the QApplication thread. Use multithreaded COM otherwise. --- gui/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gui') diff --git a/gui/main.cpp b/gui/main.cpp index fd41cbd3..e7c9c239 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -112,7 +112,7 @@ static void add_program_library_path() int main(int argc, char** argv) { #ifdef _WIN32 - init_com_threading(com_apartment); + init_com_threading(); add_program_library_path(); #elif !defined(__linux) // workaround QTBUG-38598 @@ -126,13 +126,12 @@ int main(int argc, char** argv) QApplication app(argc, argv); set_qt_style(); + MainWindow::set_working_directory(); #ifdef _WIN32 add_win32_path(); #endif - MainWindow::set_working_directory(); - { mem w = std::make_shared(); -- cgit v1.2.3