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

ProjectExplorer: Fix crash on renaming

Browse Source 
Nested event loops rearing its ugly head. Avoid all the trouble by
opening the message box on the next iteration of the event loop.

Task-number: QTCREATORBUG-13428
Change-Id: I3c06d649464c34875da9601fb2e13227a0397836
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Daniel Teske
2014-11-17 18:18:01 +01:00
parent 697b2074d3
commit ce65e9d739
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -294,6 +294,7 @@ public:
bool m_ignoreDocumentManagerChangedFile; bool m_ignoreDocumentManagerChangedFile;
QStringList m_arguments; QStringList m_arguments;
QList<ProjectPanelFactory *> m_panelFactories; QList<ProjectPanelFactory *> m_panelFactories;
QString m_renameFileError;
}; };
ProjectExplorerPluginPrivate::ProjectExplorerPluginPrivate() : ProjectExplorerPluginPrivate::ProjectExplorerPluginPrivate() :
@@ -3265,11 +3266,12 @@ void ProjectExplorerPlugin::renameFile(Node *node, const QString &to)
FolderNode *folderNode = node->parentFolderNode(); FolderNode *folderNode = node->parentFolderNode();
QString projectDisplayName = folderNode->projectNode()->displayName(); QString projectDisplayName = folderNode->projectNode()->displayName();
if (!folderNode->renameFile(orgFilePath, newFilePath)) { if (!folderNode->renameFile(orgFilePath, newFilePath)) {
QMessageBox::warning(ICore::mainWindow(), tr("Project Editing Failed"), dd->m_renameFileError = tr("The file %1 was renamed to %2, but the project file %3 could not be automatically changed.")
tr("The file %1 was renamed to %2, but the project file %3 could not be automatically changed.")
.arg(orgFilePath) .arg(orgFilePath)
.arg(newFilePath) .arg(newFilePath)
.arg(projectDisplayName)); .arg(projectDisplayName);
QTimer::singleShot(0, m_instance, SLOT(showRenameFileError()));
} else { } else {
dd->setCurrent(SessionManager::projectForFile(newFilePath), newFilePath, 0); dd->setCurrent(SessionManager::projectForFile(newFilePath), newFilePath, 0);
} }
@@ -3281,6 +3283,11 @@ void ProjectExplorerPlugin::setStartupProject()
setStartupProject(dd->m_currentProject); setStartupProject(dd->m_currentProject);
} }
void ProjectExplorerPlugin::showRenameFileError()
{
QMessageBox::warning(ICore::mainWindow(), tr("Project Editing Failed"), dd->m_renameFileError);
}
void ProjectExplorerPlugin::populateOpenWithMenu() void ProjectExplorerPlugin::populateOpenWithMenu()
{ {
DocumentManager::populateOpenWithMenu(dd->m_openWithMenu, currentNode()->path()); DocumentManager::populateOpenWithMenu(dd->m_openWithMenu, currentNode()->path());

1
src/plugins/projectexplorer/projectexplorer.h
View File

@@ -230,6 +230,7 @@ private slots:
void updateActions(); void updateActions();
void updateContext(); void updateContext();
void runConfigurationConfigurationFinished(); void runConfigurationConfigurationFinished();
void showRenameFileError();
#ifdef WITH_TESTS #ifdef WITH_TESTS
void testAnsiFilterOutputParser_data(); void testAnsiFilterOutputParser_data();