From 64916a06562a2bc72771ecb4167586f84a2d901b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Gr=C3=A4f?= <aggraef@gmail.com>
Date: Wed, 14 Dec 2022 23:39:38 +0100
Subject: [PATCH] Fix prefs dialog not closing properly (backport from Ico's
version).
See: https://github.com/pd-l2ork/pd-l2ork/commit/d657ae67
---
pd/nw/dialog_prefs.html | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/pd/nw/dialog_prefs.html b/pd/nw/dialog_prefs.html
index 6a01a941e..eadb51e40 100644
--- a/pd/nw/dialog_prefs.html
+++ b/pd/nw/dialog_prefs.html
@@ -847,8 +847,14 @@ function cancel() {
// to click the "Ok" button and open the preferences dialog again after
// that. To see if the bug is gone, try removing the next line and see
// if you can open the Prefs dialog after clicking "Ok".
+ // ico@vt.edu 2022-03-23: implemented this form of closing, so that it references
+ // the originally created window, as otherwise the window does not want to close
+ // on newer nw.js versions. this replaces window.close(true) below and needs to be
+ // called before the dialogwin["prefs"] is made into null using remove_dialogwin.
+ // see pdgui.js for more info.
+ pdgui.get_dialogwin("prefs").close(true);
pdgui.remove_dialogwin(pd_object_callback);
- window.close(true);
+ //window.close(true);
//pdgui.pdsend(pd_object_callback, "cancel");
}
@@ -1423,7 +1429,9 @@ function add_events(name) {
// closing the Window
gui.Window.get().on("close", function() {
pdgui.remove_dialogwin(pd_object_callback);
- gui.Window.get().close(true);
+ // ico@vt.edu 2022-03-23: see comment above under the same date
+ pdgui.get_dialogwin("prefs").close(true);
+ //gui.Window.get().close(true);
//cancel();
});
pdgui.dialog_bindings(name);
--
GitLab