Merge pull request #916 from diizy/stable-1.1

Sync with Zyn repository - includes a GUI fix, also a fix to RemoteZynAd...
This commit is contained in:
Vesa V committed 2014-07-02 09:44:10 +03:00
commit f3419648cf
3 files changed
+6 -2

No files matched your search

+4
View File
@@ -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
+1 -1
View File
@@ -174,7 +174,7 @@ private:
void RemoteZynAddSubFx::guiThread()
{
int exitProgram;
int exitProgram = 0;
MasterUI * ui = NULL;
while( !m_guiExit )
@@ -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