summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Abraham <aabraham@iaik.tugraz.at>2018-05-04 14:13:56 +0200
committerAndreas Abraham <aabraham@iaik.tugraz.at>2018-05-04 14:13:56 +0200
commitd9ae896ade66d7daaef16b8da0b87173c873d6cf (patch)
tree90eb1c35513be4f5df42f09f7a1067b122e31245
parentfac3aac4c418a9398a6a38980bd1bef216bfc103 (diff)
downloadpdf-over-d9ae896ade66d7daaef16b8da0b87173c873d6cf.tar.gz
pdf-over-d9ae896ade66d7daaef16b8da0b87173c873d6cf.tar.bz2
pdf-over-d9ae896ade66d7daaef16b8da0b87173c873d6cf.zip
bug fix when window is already disposed
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java4
-rw-r--r--pdf-over-gui/src/main/resources/scripts/pdf-over_win-cli.bat2
2 files changed, 5 insertions, 1 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java
index d3484889..3c8caf41 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java
@@ -142,6 +142,10 @@ public class MainWindow {
*/
public void doLayout() {
Control ctrl = this.stack.topControl;
+ if (this.container.isDisposed()) {
+ //Note: if the conainter is disposed, we are finished here
+ return;
+ }
this.container.layout(true, true);
getShell().layout(true, true);
// Note: SWT only layouts children! No grandchildren!
diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_win-cli.bat b/pdf-over-gui/src/main/resources/scripts/pdf-over_win-cli.bat
index c81c5d14..d612d64d 100644
--- a/pdf-over-gui/src/main/resources/scripts/pdf-over_win-cli.bat
+++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_win-cli.bat
@@ -1,4 +1,4 @@
@echo off
-REM start /b javaw -jar "%~dp0\..\lib\pdf-over-install-helper-1.0.0.jar"
+start /b javaw -jar "%~dp0\..\lib\pdf-over-install-helper-1.0.0.jar"
start /b /WAIT java -cp "%~dp0\..\lib\*" at.asit.pdfover.gui.Main %*