Move panic button to MIDI toolbar (reduce required horizontal space).

[ardour.git] / gtk2_ardour / new_session_dialog.cc

diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index 22ddfa395da749fd360adc24c758d7889b570d7e..4c128d4bf37366155806f88de9ee6285233dd5e2 100644 (file)
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -738,7 +738,7 @@ NewSessionDialog::which_page () const
        } else if (page_set == EnginePage) {
                return EnginePage;
 
-       } else if (page_set == NewPage|OpenPage) {
+       } else if (page_set == (NewPage|OpenPage)) {
                switch (num) {
                case 0:
                        return NewPage;
@@ -746,7 +746,7 @@ NewSessionDialog::which_page () const
                        return OpenPage;
                }
 
-       } else if (page_set == NewPage|EnginePage) {
+       } else if (page_set == (NewPage|EnginePage)) {
                switch (num) {
                case 0:
                        return NewPage;
@@ -754,7 +754,7 @@ NewSessionDialog::which_page () const
                        return EnginePage;
                }
 
-       } else if (page_set == NewPage|EnginePage|OpenPage) {
+       } else if (page_set == (NewPage|EnginePage|OpenPage)) {
                switch (num) {
                case 0:
                        return NewPage;
@@ -764,7 +764,7 @@ NewSessionDialog::which_page () const
                        return EnginePage;
                }
 
-       } else if (page_set == OpenPage|EnginePage) {
+       } else if (page_set == (OpenPage|EnginePage)) {
                switch (num) {
                case 0:
                        return OpenPage;
@@ -772,6 +772,8 @@ NewSessionDialog::which_page () const
                        return EnginePage;
                }
        }
+
+       return NewPage; /* shouldn't get here */
 }
 
 void