Commit 3a4412c3 authored by dt's avatar dt
Browse files

Merge commit 'origin/master'

parents 7f38e17e bf118eba
...@@ -41,7 +41,7 @@ using namespace Designer::Constants; ...@@ -41,7 +41,7 @@ using namespace Designer::Constants;
enum { ActionEditorTab, SignalSlotEditorTab }; enum { ActionEditorTab, SignalSlotEditorTab };
enum { wantSignalSlotEditor = 0 }; enum { wantSignalSlotEditor = 1 };
namespace Designer { namespace Designer {
namespace Internal { namespace Internal {
......
...@@ -1618,7 +1618,7 @@ void ProjectExplorerPlugin::addExistingFiles() ...@@ -1618,7 +1618,7 @@ void ProjectExplorerPlugin::addExistingFiles()
void ProjectExplorerPlugin::openFile() void ProjectExplorerPlugin::openFile()
{ {
if (m_currentNode) if (!m_currentNode)
return; return;
Core::EditorManager *em = Core::EditorManager::instance(); Core::EditorManager *em = Core::EditorManager::instance();
em->openEditor(m_currentNode->path()); em->openEditor(m_currentNode->path());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment