Merge branch 'master' into gtk3

2016-07-09 23:49:31 +02:00
parent 93360770e1 3b734e4a7a
commit 040962c1b7
49 changed files with 418 additions and 419 deletions
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -667,7 +667,7 @@ bool RTWindow::on_delete_event(GdkEventAny* event)
            Gtk::Widget *w = mainNB->get_nth_page(page);
            bool optionsWritten = false;

-            for (std::map<Glib::ustring, EditorPanel*>::iterator i = epanels.begin(); i != epanels.end(); i++) {
+            for (std::map<Glib::ustring, EditorPanel*>::iterator i = epanels.begin(); i != epanels.end(); ++i) {
                if (i->second == w) {
                    i->second->writeOptions();
                    optionsWritten = true;