projects
/
profile
/
ivi
/
hfdialer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86f7d95
)
Fix crasher bug when attempting to show the active window before it is created
061812165722
061812165933
author
Rusty Lynch
<rusty.lynch@intel.com>
Mon, 18 Jun 2012 23:52:13 +0000
(16:52 -0700)
committer
Rusty Lynch
<rusty.lynch@intel.com>
Mon, 18 Jun 2012 23:52:13 +0000
(16:52 -0700)
src/qmlmainwindow.cpp
patch
|
blob
|
history
diff --git
a/src/qmlmainwindow.cpp
b/src/qmlmainwindow.cpp
index
72d3963
..
c3096dc
100644
(file)
--- a/
src/qmlmainwindow.cpp
+++ b/
src/qmlmainwindow.cpp
@@
-136,9
+136,12
@@
void QMLMainWindow::tryToShow()
if (d->component->isReady())
{
DialerApplication *da = DialerApplication::instance();
- da->activeWindow();
- da->activeWindow()->show();
- da->activeWindow()->activateWindow();
+ QWidget *w = da->activeWindow();
+ if (w)
+ {
+ da->activeWindow()->show();
+ da->activeWindow()->activateWindow();
+ }
this->show();
}