Merge pull request #916 from diizy/stable-1.1

Sync with Zyn repository - includes a GUI fix, also a fix to RemoteZynAd...
2014-07-02 09:44:10 +03:00
parent dca67b4313 bcbf54150f
commit f3419648cf
3 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@
 .*.sw?
 *~
 /CMakeLists.txt.user
+/plugins/zynaddsubfx/zynaddsubfx/ExternalPrograms/Controller/Makefile
+/plugins/zynaddsubfx/zynaddsubfx/ExternalPrograms/Spliter/Makefile
+/plugins/zynaddsubfx/zynaddsubfx/doc/Makefile
+/plugins/zynaddsubfx/zynaddsubfx/doc/gen/Makefile
--- a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
@@ -174,7 +174,7 @@ private:

 void RemoteZynAddSubFx::guiThread()
 {
-	int exitProgram;
+	int exitProgram = 0;
 	MasterUI * ui = NULL;

 	while( !m_guiExit )
--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl
@@ -837,7 +837,7 @@ if (part->Pkitmode==0) {
    }
    Fl_Window instrumenteditwindow {
      label {Instrument Edit} open
-      xywh {247 621 395 360} type Double box NO_BOX visible
+      xywh {182 214 395 360} type Double hide
    } {
      Fl_Group {} {
        xywh {0 220 395 110} box UP_FRAME