mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-20 06:49:56 +00:00
Fix bug #7002. I think this is correct, but Peter should check.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35970 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
7c2b2c464b
commit
9b105fc6bf
@ -16,6 +16,7 @@
|
|||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QWaitCondition>
|
#include <QWaitCondition>
|
||||||
|
|
||||||
|
#include "frontends/Application.h"
|
||||||
#include "support/bind.h"
|
#include "support/bind.h"
|
||||||
#include "support/functional.h"
|
#include "support/functional.h"
|
||||||
|
|
||||||
@ -58,7 +59,10 @@ public:
|
|||||||
R call(F f)
|
R call(F f)
|
||||||
{
|
{
|
||||||
func_ = f;
|
func_ = f;
|
||||||
callInGuiThread();
|
if (theApp() == 0)
|
||||||
|
synchronousFunctionCall();
|
||||||
|
else
|
||||||
|
callInGuiThread();
|
||||||
return return_value_;
|
return return_value_;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,7 +125,10 @@ public:
|
|||||||
void call(F f)
|
void call(F f)
|
||||||
{
|
{
|
||||||
func_ = f;
|
func_ = f;
|
||||||
callInGuiThread();
|
if (theApp() == 0)
|
||||||
|
synchronousFunctionCall();
|
||||||
|
else
|
||||||
|
callInGuiThread();
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class F, class P1>
|
template<class F, class P1>
|
||||||
|
Loading…
Reference in New Issue
Block a user