summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcorvid <devnull@localhost>2015-07-05 00:04:56 +0000
committercorvid <devnull@localhost>2015-07-05 00:04:56 +0000
commit30f8add92bd3b0e1d4e6cf38d2310d199e4f6b10 (patch)
tree94c067910627f800b8b9ea409a6fbf8ddb9527dc
parent86f2c578890551d708b89a0f1541b389fcf09aeb (diff)
restore lost initialization of choice_answer
looks like we lost it in "changeset 2768:e7f98f931ed7 Modified a_Dialog_choice5() to accept any number of alternatives [p37sitdu]"
-rw-r--r--ChangeLog1
-rw-r--r--src/dialog.cc2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 72a6bcb9..cd8d1588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@ dillo-3.1 [not released yet]
- Abort failed queries.
- HTTP Strict Transport Security (disable with http_strict_transport_security
preference in dillorc).
+ - Fix bug when closing popup using window manager (bug introduced in 3.0.3).
Patches: corvid
+- Doxygen fixes.
Patch: Jeremy Henty
diff --git a/src/dialog.cc b/src/dialog.cc
index 03949a1c..64f60e38 100644
--- a/src/dialog.cc
+++ b/src/dialog.cc
@@ -382,6 +382,8 @@ int a_Dialog_choice(const char *title, const char *msg, ...)
va_end(ap);
window->end();
+ choice_answer = 0;
+
window->show();
while (window->shown())
Fl::wait();