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

Fix a crash on "Switch to Text Diff Editor"

Browse Source 
Task-number: QTCREATORBUG-11448

Change-Id: Id0239d5cf71ff857ac384e18136348df92a98b74
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
jkobus
2014-02-10 16:38:55 +01:00
committed by Jarek Kobus
parent 25e206f59a
commit 7267c95acf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitclient.cpp
View File

@@ -122,7 +122,9 @@ public:
QAction *switchAction = new QAction(actionIcon, actionToolTip, parentEditor); QAction *switchAction = new QAction(actionIcon, actionToolTip, parentEditor);
parentEditor->toolBar()->addAction(switchAction); parentEditor->toolBar()->addAction(switchAction);
connect(switchAction, SIGNAL(triggered()), this, SLOT(execute()));
// must be queued connection because execute() removes the editor & tool bar that the action was added to
connect(switchAction, SIGNAL(triggered()), this, SLOT(execute()), Qt::QueuedConnection);
} }
void setWorkingDirectory(const QString &workingDir) { m_workingDirectory = workingDir; } void setWorkingDirectory(const QString &workingDir) { m_workingDirectory = workingDir; }