Merge pull request #5843 from alja/macX_72

72x: Fix crash on remote X connection using XQuartz version 2.7.7
cms-sw · Oct 16, 2014 · 8112dd3 · 8112dd3
2 parents ad1adef + 7b5f333
commit 8112dd3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Fireworks/Core/src/CmsShowMain.cc b/Fireworks/Core/src/CmsShowMain.cc
@@ -284,7 +284,7 @@ CmsShowMain::CmsShowMain(int argc, char *argv[])
    // open any graphics or build dictionaries
    AutoLibraryLoader::enable();
 
-   TEveManager::Create(kFALSE, "FIV");
+   TEveManager::Create(kFALSE, eveMode ? "FIV" : "FI");
 
    setup(m_navigator.get(), m_context.get(), m_metadataManager.get());
 

diff --git a/Fireworks/FWInterface/src/FWFFHelper.cc b/Fireworks/FWInterface/src/FWFFHelper.cc
@@ -76,5 +76,5 @@ FWFFHelper::FWFFHelper(const edm::ParameterSet &ps, const edm::ActivityRegistry
    }
 #endif
 
-    TEveManager::Create(kFALSE, "FIV");
+    TEveManager::Create(kFALSE, "FI");
 }