X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=e4b026889c591923278ba165828fbc242a2f7874;hb=d2e1ae556ea6e51fc3b75764202a2243db24fcf0;hp=55ac5410be4ec6ee87d815395feb45250b751c9e;hpb=449972484abe4b99beef5ac1ed918814e76041c6;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 55ac541..e4b0268 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -1124,8 +1124,8 @@ App::App(int *argc, char ***argv):
 
 	gdk_rgb_init();
 
-	// don't call thread_init() if threads are already initialised
-	// on some machines bonobo_init() initialised threads before we get here
+	// don't call thread_init() if threads are already initialized
+	// on some machines bonobo_init() initialized threads before we get here
 	if (!g_thread_supported())
 		Glib::thread_init();
 
@@ -1444,7 +1444,7 @@ App::add_recent_file(const std::string &file_name)
 	if(basename(filename)[0]=='.')
 		return;
 
-	// If we aren't an absolute path, turn outselves into one
+	// If we aren't an absolute path, turn ourselves into one
 	if(!is_absolute_path(filename))
 		filename=absolute_path(filename);
 
@@ -2072,7 +2072,10 @@ App::new_instance()
 	canvas->rend_desc().set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN);
 	canvas->set_file_name(file_name);
 
-	Instance::create(canvas)->find_canvas_view(canvas)->canvas_properties.present();
+	handle<Instance> instance = Instance::create(canvas);
+
+	if (!getenv("SYNFIG_DISABLE_NEW_CANVAS_EDIT_PROPERTIES"))
+		instance->find_canvas_view(canvas)->canvas_properties.present();
 }
 
 void