comparison main/MainWindow.cpp @ 464:af0a2d9ece0c toggle

* Avoid crash on startup if m_alAction does not exist (which happens if no MATCH plugin)
* Force max height on minimal mode calculated by removing scroll height from height before minimisation -- otherwise for some reason the height is calculated too tall on Mac

 
     //std::cerr << "minimal mode enabled was: " << wasMinimal << std::endl;
 
     bool show;
 
+    int maxHeight = QWIDGETSIZE_MAX;
+
     if (wasMinimal) {
 
         show = true;
         m_viewManager->setMinimalModeEnabled(false);
         m_scroll->show();

         menuBar()->addMenu(m_helpMenu);
 
     } else {
 
         settings.setValue("size", size());
+
+        maxHeight = height() - m_scroll->height();
 
         show = false;
         m_viewManager->setMinimalModeEnabled(true);
         m_scroll->hide();
 

     m_showStatusBarAction->setVisible(show);
     //add/remove actions from the Playback menu
     m_playSelectionAction->setVisible(show);
     m_playLoopAction->setVisible(show);
     m_soloAction->setVisible(show);
-    m_alAction->setVisible(show);
+    if (m_alAction) m_alAction->setVisible(show);
 
     m_playControlsSpacer->setVisible(show);
+
+    setMaximumHeight(maxHeight);
 
     if (wasMinimal) {
         resizeConstrained(settings.value("size").toSize());
     } else {
         QApplication::processEvents();