diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-17 21:40:22 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-17 22:32:03 +0200 |
| commit | 62c137157ed04d08e6bcc7a741bcdb046943776f (patch) | |
| tree | 8f717bd5fa9fdda743f08677544e8cd5c9f9fef2 /cv | |
| parent | fad4b316af2cde1a5988ed1bbdbc4ba5933e88df (diff) | |
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.
Diffstat (limited to 'cv')
| -rw-r--r-- | cv/camera-dialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |