From 62c137157ed04d08e6bcc7a741bcdb046943776f Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
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.
---
 cv/camera-dialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cv')

diff --git a/cv/camera-dialog.cpp b/cv/camera-dialog.cpp
index c3e8f6fe..b422e63c 100644
--- a/cv/camera-dialog.cpp
+++ b/cv/camera-dialog.cpp
@@ -25,7 +25,7 @@ camera_dialog::~camera_dialog() {}
 void camera_dialog::open_camera_settings(cv::VideoCapture* cap, const QString& camera_name, QMutex* camera_mtx)
 {
 #ifdef _WIN32
-    init_com_threading(com_apartment);
+    init_com_threading();
 
     if (cap)
     {
-- 
cgit v1.2.3