anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

check also if there is a QApplication instance

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35981 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-11-01 21:32:59 +00:00
parent a3c84666b2
commit 8718c455a6
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontends/qt4/InGuiThread.cpp
View File

@ -12,6 +12,8 @@
#include "InGuiThread.h"
#include "frontends/Application.h"
#include <QThread>
#include <QEventLoop>
#include <QApplication>
@ -29,11 +31,11 @@ IntoGuiThreadMover::IntoGuiThreadMover()
void IntoGuiThreadMover::callInGuiThread()
{
QThread* gui_thread = QApplication::instance()->thread();
if (QThread::currentThread() == gui_thread) {
if (!theApp() || !QApplication::instance() ||
QThread::currentThread() == QApplication::instance()->thread()) {
synchronousFunctionCall();
} else {
moveToThread(gui_thread);
moveToThread(QApplication::instance()->thread());
connect(this, SIGNAL(triggerFunctionCall()),
this, SLOT(doFunctionCall()), Qt::QueuedConnection);
QMutexLocker lock(&sync_mutex_);

11
src/frontends/qt4/InGuiThread.h
View File

@ -16,7 +16,6 @@
#include <QObject>
#include <QWaitCondition>
#include "frontends/Application.h"
#include "support/bind.h"
#include "support/functional.h"
@ -59,10 +58,7 @@ public:
R call(F f)
{
func_ = f;
if (theApp() == 0)
synchronousFunctionCall();
else
callInGuiThread();
callInGuiThread();
return return_value_;
}
@ -125,10 +121,7 @@ public:
void call(F f)
{
func_ = f;
if (theApp() == 0)
synchronousFunctionCall();
else
callInGuiThread();
callInGuiThread();
}
template<class F, class P1>