make config-window suitable for small[er] screens

[ardour.git] / gtk2_ardour / startup.cc

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 208364447cb56826cba83b3e1e48ea588b0770d1..6f0b1cfaab5262067c2bae6e1a7100231bc6a5c8 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -129,8 +129,6 @@ ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name,
                        set_default_icon_list (window_icons);
                }
 
-               set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG);
-               
 #ifdef __APPLE__
                setup_prerelease_page ();
 #endif
@@ -684,12 +682,18 @@ ArdourStartup::on_apply ()
 
                Config->set_use_monitor_bus (use_monitor_section_button.get_active());
 
-               /* "touch" the been-here-before path now that we're about to save Config */
-               ofstream fout (been_here_before_path().c_str());
-               
                Config->save_state ();
+
        }
 
+       {
+               /* "touch" the been-here-before path now we've successfully
+                  made it through the first time setup (at least)
+               */
+               ofstream fout (been_here_before_path().c_str());
+
+       }
+               
        _response = RESPONSE_OK;
        gtk_main_quit ();
 }
@@ -1453,7 +1457,7 @@ ArdourStartup::info_scroller_update()
 
        char buf[512];
        snprintf (buf, std::min(info_scroller_count,sizeof(buf)-1), "%s", ARDOUR_UI::instance()->announce_string().c_str() );
-       buf[info_scroller_count] = NULL;
+       buf[info_scroller_count] = 0;
        info_scroller_label.set_text (buf);
        info_scroller_label.show();