diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-08-22 22:44:16 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-08-25 13:21:55 +0200 |
commit | b70fb7d704aa721cf7b1f3ce1120f84f89429479 (patch) | |
tree | 512318380d0e783ae31066fdca071aaacc517932 /desktop | |
parent | 6797610bcfc41d2af57db03c5d9b52cfc30d09ed (diff) |
everything is independent from vos these days...
Change-Id: Iccb94dcc31d6de8c9e4e7a31b3c2e36d4198b295
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/app.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 0332f9093461..3f8cd6c7272f 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2873,10 +2873,8 @@ void Desktop::CheckFirstRun( ) { if (officecfg::Office::Common::Misc::FirstRun::get()) { - // this has once been done using a vos timer. this could lead to problems when - // the timer would trigger when the app is already going down again, since VCL would - // no longer be available. Since the old handler would do a postUserEvent to the main - // thread anyway, we can use a vcl timer here to prevent the race contition (#107197#) + // use VCL timer, which won't trigger during shutdown if the + // application exits before timeout m_firstRunTimer.SetTimeout(3000); // 3 sec. m_firstRunTimer.SetTimeoutHdl(LINK(this, Desktop, AsyncInitFirstRun)); m_firstRunTimer.Start(); |