Commit 506ada2d authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

fix dialog closing logic so that there aren't any dangling gfxstubs left on the Pd side

parent 28b5895d
Pipeline #513 failed with stage
in 205 minutes and 51 seconds
......@@ -753,10 +753,7 @@ function add_events(name) {
// closing the Window
gui.Window.get().on("close", function() {
// this needs to do whatever the "cancel" button does
//pdgui.pdsend(name + " menuclose 0");
//cancel();
pdgui.remove_dialogwin(pd_object_callback);
gui.Window.get().close(true);
cancel();
});
pdgui.dialog_bindings(name);
}
......
......@@ -360,10 +360,7 @@ function add_events(name) {
// closing the Window
gui.Window.get().on("close", function () {
// this needs to do whatever the "cancel" button does
//pdgui.pdsend(name, "menuclose 0");
//cancel();
pdgui.remove_dialogwin(pd_object_callback);
gui.Window.get().close(true);
cancel();
});
pdgui.dialog_bindings(name);
}
......
......@@ -177,10 +177,7 @@ function add_events(name) {
// closing the Window
gui.Window.get().on("close", function () {
// this needs to do whatever the "cancel" button does
//pdgui.pdsend(name, "menuclose 0");
//cancel();
pdgui.remove_dialogwin(pd_object_callback);
gui.Window.get().close(true);
cancel();
});
pdgui.dialog_bindings(name);
}
......
......@@ -322,10 +322,7 @@ function add_events(name) {
// closing the Window
gui.Window.get().on("close", function() {
// this needs to do whatever the "cancel" button does
//pdgui.pdsend(name, "menuclose 0");
//cancel();
pdgui.remove_dialogwin(pd_object_callback);
gui.Window.get().close(true);
cancel(false);
});
pdgui.dialog_bindings(name);
}
......
......@@ -618,10 +618,7 @@ function add_events(name) {
// closing the Window
gui.Window.get().on("close", function() {
// this needs to do whatever the "cancel" button does
//pdgui.pdsend(name, "menuclose 0");
//cancel();
pdgui.remove_dialogwin(pd_object_callback);
gui.Window.get().close(true);
cancel(false);
});
pdgui.dialog_bindings(name);
}
......
......@@ -787,9 +787,9 @@ function add_events(name) {
// closing the Window
gui.Window.get().on("close", function() {
// this needs to do whatever the "cancel" button does
pdgui.remove_dialogwin(pd_object_callback);
gui.Window.get().close(true);
//cancel();
});
pdgui.dialog_bindings(name);
}
......
......@@ -139,8 +139,8 @@ function translate_form() {
function close_window() {
pdgui.pdsend(pd_object_callback, "close");
pdgui.remove_dialogwin(pd_object_callback);
gui.Window.get().close(true);
//pdgui.remove_dialogwin(pd_object_callback);
//gui.Window.get().close(true);
}
function close_from_pd(signoff) {
......
......@@ -4258,7 +4258,7 @@ function gui_text_dialog_close_from_pd(did, signoff) {
function gui_remove_gfxstub(did) {
if (dialogwin[did] !== undefined && dialogwin[did] !== null) {
dialogwin[did].window.close(true);
dialogwin[did].close(true);
dialogwin[did] = null;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment