Merge pull request #748 from openstudiocoalition/747_CrashShoebox

Fix #747 - crash shoebox

Author: jmarrec

src/openstudio_app/OpenStudioApp.cpp

@@ -1553,14 +1553,16 @@ void OpenStudioApp::loadShoeboxModel() {
   versionTranslator.setAllowNewerVersions(false);
 
   auto filePath = resourcesPath() / toPath("ShoeboxModel/ShoeboxExample.osm");
-  boost::optional<openstudio::model::Model> model = versionTranslator.loadModel(filePath);
-  if (!model && isOpenStudioApplicationRunningFromBuildDirectory()) {
+  boost::optional<openstudio::model::Model> model_;
+  if (openstudio::filesystem::is_regular_file(filePath)) {
+    model_ = versionTranslator.loadModel(filePath);
+  } else if (isOpenStudioApplicationRunningFromBuildDirectory()) {
     filePath = getOpenStudioCoalitionMeasuresSourceDirectory() / toPath("models/ShoeboxExample.osm");
-    model = versionTranslator.loadModel(filePath);
+    model_ = versionTranslator.loadModel(filePath);
   }
 
-  if (model) {
-    m_osDocument = std::make_shared<OSDocument>(componentLibrary(), resourcesPath(), model, toQString(filePath), false, startTabIndex());
+  if (model_) {
+    m_osDocument = std::make_shared<OSDocument>(componentLibrary(), resourcesPath(), model_, toQString(filePath), false, startTabIndex());
     m_osDocument->setSavePath("");
     connectOSDocumentSignals();
 

src/shared_gui_components/LocalLibraryController.cpp

@@ -497,7 +497,8 @@ QWidget* LibraryItemDelegate::view(QSharedPointer<OSListItem> dataSource) {
     // Name
 
     widget->label->setText(libraryItem->displayName());
-    const bool useClassicCLI = OSAppBase::instance()->currentDocument()->mainWindow()->useClassicCLI();
+    const bool useClassicCLI =
+      OSAppBase::instance()->currentDocument() == nullptr ? false : OSAppBase::instance()->currentDocument()->mainWindow()->useClassicCLI();
     if (useClassicCLI && (measureLanguage == MeasureLanguage::Python)) {
       widget->setToolTip("Python Measures are not supported in the Classic CLI.\nYou can change CLI version using 'Preferences->Use Classic CLI'.");
       widget->errorLabel->setVisible(true);

src/shared_gui_components/WorkflowController.cpp

@@ -570,7 +570,8 @@ QWidget* MeasureStepItemDelegate::view(QSharedPointer<OSListItem> dataSource) {
 
     connect(measureStepItem.data(), &MeasureStepItem::selectedChanged, workflowStepView->workflowStepButton, &WorkflowStepButton::setHasEmphasis);
 
-    const bool useClassicCLI = OSAppBase::instance()->currentDocument()->mainWindow()->useClassicCLI();
+    const bool useClassicCLI =
+      OSAppBase::instance()->currentDocument() == nullptr ? false : OSAppBase::instance()->currentDocument()->mainWindow()->useClassicCLI();
     if (useClassicCLI && (measureLanguage == MeasureLanguage::Python)) {
       workflowStepView->workflowStepButton->errorLabel->setToolTip(
         "Python Measures are not supported in the Classic CLI.\nYou can change CLI version using 'Preferences->Use Classic CLI'.");