--- a/src/hbcore/core/hbinstance.cpp Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbcore/core/hbinstance.cpp Fri Sep 17 08:32:10 2010 +0300
@@ -265,11 +265,15 @@
#ifdef HB_SETTINGS_WINDOW
QShortcut *shortcut = new QShortcut(QKeySequence("Ctrl+Alt+Shift+S"), window);
connect(shortcut, SIGNAL(activated()), this, SLOT(showHideSettingsWindow()));
- HbSettingsWindow::instance()->refresh();
+ if (HbSettingsWindow::exists()) {
+ HbSettingsWindow::instance()->refresh();
+ }
#ifdef HB_CSS_INSPECTOR
QShortcut *cssShortcut = new QShortcut(QKeySequence("Ctrl+Alt+Shift+C"), window);
connect(cssShortcut, SIGNAL(activated()), this, SLOT(showHideCssWindow()));
- HbCssInspectorWindow::instance()->refresh();
+ if (HbCssInspectorWindow::exists()) {
+ HbCssInspectorWindow::instance()->refresh();
+ }
#endif
#endif
emit windowAdded(window);
@@ -302,11 +306,15 @@
bool result = mWindows.removeOne(window);
#ifdef HB_SETTINGS_WINDOW
if (result && mWindows.isEmpty()) {
- HbSettingsWindow::instance()->close();
+ if (HbSettingsWindow::exists()) {
+ HbSettingsWindow::instance()->close();
+ }
#ifdef HB_CSS_INSPECTOR
- HbCssInspectorWindow::instance()->close();
+ if (HbCssInspectorWindow::exists()) {
+ HbCssInspectorWindow::instance()->close();
+ }
#endif
- } else {
+ } else if (HbSettingsWindow::exists()) {
HbSettingsWindow::instance()->refresh();
}
#endif