Merge branch 'master' into gtk3

2015-12-01 18:59:59 +01:00
parent 72acf67304 e85da94b8e
commit 2e720bdeb8
34 changed files with 89 additions and 138 deletions
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -528,7 +528,6 @@ void EditorPanel::open (Thumbnail* tmb, rtengine::InitialImage* isrc)
    lastSaveAsFileName = removeExtension (Glib::path_get_basename (fname));

    previewHandler = new PreviewHandler ();
-    previewHandler2 = new PreviewHandler ();

    this->isrc = isrc;
    ipc = rtengine::StagedImageProcessor::create (isrc);