Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / big_clock_window.cc

diff --git a/gtk2_ardour/big_clock_window.cc b/gtk2_ardour/big_clock_window.cc
index 7a96293b052f0279b15a28d26144717b18d252e0..c67ae38074f9a8ca71e5787393c6f1682bb976ff 100644 (file)
--- a/gtk2_ardour/big_clock_window.cc
+++ b/gtk2_ardour/big_clock_window.cc
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <string>
+#include <vector>
 
 #include "ardour_ui.h"
 #include "audio_clock.h"
@@ -53,6 +54,8 @@ BigClockWindow::BigClockWindow (AudioClock& c)
 void
 BigClockWindow::on_unmap ()
 {
+       ArdourWindow::on_unmap ();
+
        PublicEditor::instance().reset_focus ();
 }
 
@@ -136,11 +139,11 @@ BigClockWindow::text_resizer (int, int)
        if (size != current_size) {
 
                string family = fd.get_family();
-               char buf[family.length()+16];
-               snprintf (buf, family.length()+16, "%s %d", family.c_str(), size);
+               std::vector<char> buf(family.length()+16);
+               snprintf (&buf[0], family.length()+16, "%s %d", family.c_str(), size);
 
                try {
-                       Pango::FontDescription fd (buf);
+                       Pango::FontDescription fd (&buf[0]);
                        Glib::RefPtr<Gtk::RcStyle> rcstyle = clock.get_modifier_style ();
                        rcstyle->set_font (fd);
                        clock.modify_style (rcstyle);