feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix crash on loadup

Browse Source 
Make DesignModeWidget::showEditor reentrant save by explicitly checking
the current status.

The crash happens only reproducably when debugging creator inside
creator (gdb-7.0-ubuntu!).

Reviewed-by: Lasse Holmstedt
This commit is contained in:
Kai Koehne
2010-04-06 10:49:16 +02:00
parent 639ae491c1
commit 34b84d8c06
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -123,7 +123,7 @@ DesignModeWidget::DesignModeWidget(QWidget *parent) :
m_mainSplitter(0), m_mainSplitter(0),
m_leftSideBar(0), m_leftSideBar(0),
m_rightSideBar(0), m_rightSideBar(0),
m_setup(false), m_initStatus(NotInitialized),
m_warningWidget(0) m_warningWidget(0)
{ {
m_undoAction = new QAction(tr("&Undo"), this); m_undoAction = new QAction(tr("&Undo"), this);
@@ -148,8 +148,17 @@ DesignModeWidget::~DesignModeWidget()
void DesignModeWidget::showEditor(Core::IEditor *editor) void DesignModeWidget::showEditor(Core::IEditor *editor)
{ {
show(); //
setup(); // Prevent recursive calls to function by explicitly managing initialization status
// (QApplication::processEvents is called explicitly at a number of places)
//
if (m_initStatus == Initializing)
return;
if (m_initStatus == NotInitialized) {
m_initStatus = Initializing;
setup();
}
QString fileName; QString fileName;
QPlainTextEdit *textEdit = 0; QPlainTextEdit *textEdit = 0;
@@ -193,6 +202,8 @@ void DesignModeWidget::showEditor(Core::IEditor *editor)
} }
} }
setCurrentDocument(document); setCurrentDocument(document);
m_initStatus = Initialized;
} }
void DesignModeWidget::closeEditors(QList<Core::IEditor*> editors) void DesignModeWidget::closeEditors(QList<Core::IEditor*> editors)
@@ -477,10 +488,6 @@ void DesignModeWidget::setCurrentDocument(DesignDocumentController *newDesignDoc
void DesignModeWidget::setup() void DesignModeWidget::setup()
{ {
if (m_setup)
return;
m_setup = true;
QList<Core::INavigationWidgetFactory *> factories = ExtensionSystem::PluginManager::instance()->getObjects<Core::INavigationWidgetFactory>(); QList<Core::INavigationWidgetFactory *> factories = ExtensionSystem::PluginManager::instance()->getObjects<Core::INavigationWidgetFactory>();
QWidget *openDocumentsWidget = 0; QWidget *openDocumentsWidget = 0;

5
src/plugins/qmldesigner/designmodewidget.h
View File

@@ -179,7 +179,10 @@ private:
Core::EditorToolBar *m_fakeToolBar; Core::EditorToolBar *m_fakeToolBar;
bool m_isDisabled; bool m_isDisabled;
bool m_setup;
enum InitializeStatus { NotInitialized, Initializing, Initialized };
InitializeStatus m_initStatus;
DocumentWarningWidget *m_warningWidget; DocumentWarningWidget *m_warningWidget;
}; };