diff --git a/synfig-core/src/synfig/filesystemtemporary.cpp b/synfig-core/src/synfig/filesystemtemporary.cpp
index 05ab87c..9c17c68 100644
--- a/synfig-core/src/synfig/filesystemtemporary.cpp
+++ b/synfig-core/src/synfig/filesystemtemporary.cpp
@@ -67,7 +67,7 @@ FileSystemTemporary::FileSystemTemporary(const String &tag, const String &tempor
FileSystemTemporary::~FileSystemTemporary()
{
- discard_changes();
+
}
String
diff --git a/synfig-studio/src/gui/CMakeLists.txt b/synfig-studio/src/gui/CMakeLists.txt
index 0ba29ba..220ddbc 100644
--- a/synfig-studio/src/gui/CMakeLists.txt
+++ b/synfig-studio/src/gui/CMakeLists.txt
@@ -43,6 +43,7 @@ target_sources(synfigstudio
"${CMAKE_CURRENT_LIST_DIR}/ipc.cpp"
"${CMAKE_CURRENT_LIST_DIR}/keymapsettings.cpp"
"${CMAKE_CURRENT_LIST_DIR}/onemoment.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/pluginmanager.cpp"
"${CMAKE_CURRENT_LIST_DIR}/preview.cpp"
"${CMAKE_CURRENT_LIST_DIR}/renddesc.cpp"
"${CMAKE_CURRENT_LIST_DIR}/render.cpp"
diff --git a/synfig-studio/src/gui/Makefile.am b/synfig-studio/src/gui/Makefile.am
index 989fd71..61ee7b9 100644
--- a/synfig-studio/src/gui/Makefile.am
+++ b/synfig-studio/src/gui/Makefile.am
@@ -52,6 +52,7 @@ OTHER_HH = \
ipc.h \
keymapsettings.h \
onemoment.h \
+ pluginmanager.h \
preview.h \
renddesc.h \
render.h \
@@ -83,6 +84,7 @@ OTHER_CC = \
ipc.cpp \
keymapsettings.cpp \
onemoment.cpp \
+ pluginmanager.cpp \
preview.cpp \
renddesc.cpp \
render.cpp \
diff --git a/synfig-studio/src/gui/app.cpp b/synfig-studio/src/gui/app.cpp
index c90d134..78054eb 100644
--- a/synfig-studio/src/gui/app.cpp
+++ b/synfig-studio/src/gui/app.cpp
@@ -313,7 +313,7 @@ int studio::App::preferred_y_size = 270;
String studio::App::predefined_size (DEFAULT_PREDEFINED_SIZE);
String studio::App::predefined_fps (DEFAULT_PREDEFINED_FPS);
float studio::App::preferred_fps = 24.0;
-synfigapp::PluginManager studio::App::plugin_manager;
+PluginManager studio::App::plugin_manager;
std::set< String > studio::App::brushes_path;
String studio::App::image_editor_path;
@@ -1203,12 +1203,12 @@ DEFINE_ACTION("keyframe-properties", _("Properties"));
"