author | zecke <zecke> | 2005-03-06 23:30:41 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-03-06 23:30:41 (UTC) |
commit | f312f32d624c6198c63890e141e8658bc492cf37 (patch) (unidiff) | |
tree | c76e9caad09226113e42e0477d08e13d6388af2e | |
parent | 578cc81bc489015320351efd4fabcbed3355ac23 (diff) | |
download | opie-f312f32d624c6198c63890e141e8658bc492cf37.zip opie-f312f32d624c6198c63890e141e8658bc492cf37.tar.gz opie-f312f32d624c6198c63890e141e8658bc492cf37.tar.bz2 |
The mainwidget could be deleted before the qpeapplication will be destructed or
the event loop will be left.
Use a QGuardedPtr to not save widget coordinates on a not anymore existing
mainwidget
-rw-r--r-- | library/qpeapplication.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 2bd7cbe..953f9d0 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -166,9 +166,9 @@ public: | |||
166 | QCString channel; | 166 | QCString channel; |
167 | QCString message; | 167 | QCString message; |
168 | QByteArray data; | 168 | QByteArray data; |
169 | }; | 169 | }; |
170 | QWidget* qpe_main_widget; | 170 | QGuardedPtr<QWidget> qpe_main_widget; |
171 | QGuardedPtr<QWidget> lastraised; | 171 | QGuardedPtr<QWidget> lastraised; |
172 | QQueue<QCopRec> qcopq; | 172 | QQueue<QCopRec> qcopq; |
173 | QString styleName; | 173 | QString styleName; |
174 | QString decorationName; | 174 | QString decorationName; |
@@ -318,8 +318,11 @@ public: | |||
318 | } | 318 | } |
319 | 319 | ||
320 | static void store_widget_rect(QWidget *w, QString &app) | 320 | static void store_widget_rect(QWidget *w, QString &app) |
321 | { | 321 | { |
322 | if( !w ) | ||
323 | return; | ||
324 | |||
322 | // 350 is the trigger in qwsdefaultdecoration for providing a resize button | 325 | // 350 is the trigger in qwsdefaultdecoration for providing a resize button |
323 | if ( qApp->desktop()->width() <= 350 ) | 326 | if ( qApp->desktop()->width() <= 350 ) |
324 | return; | 327 | return; |
325 | // we use these to map the offset of geometry and pos. ( we can only use normalGeometry to | 328 | // we use these to map the offset of geometry and pos. ( we can only use normalGeometry to |