git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-2349_JAL-3855
[jalview.git]
/
src
/
jalview
/
gui
/
StructureViewerBase.java
diff --git
a/src/jalview/gui/StructureViewerBase.java
b/src/jalview/gui/StructureViewerBase.java
index
ec5579c
..
1e12f7f
100644
(file)
--- a/
src/jalview/gui/StructureViewerBase.java
+++ b/
src/jalview/gui/StructureViewerBase.java
@@
-135,6
+135,7
@@
public abstract class StructureViewerBase extends GStructureViewer
public StructureViewerBase()
{
super();
public StructureViewerBase()
{
super();
+ setFrameIcon(null);
}
/**
}
/**
@@
-1280,6
+1281,9
@@
public abstract class StructureViewerBase extends GStructureViewer
if (confirm == JvOptionPane.CANCEL_OPTION
|| confirm == JvOptionPane.CLOSED_OPTION)
{
if (confirm == JvOptionPane.CANCEL_OPTION
|| confirm == JvOptionPane.CLOSED_OPTION)
{
+ // abort possible quit handling if CANCEL chosen
+ if (confirm == JvOptionPane.CANCEL_OPTION)
+ QuitHandler.abortQuit();
return;
}
forceClose = confirm == JvOptionPane.YES_OPTION;
return;
}
forceClose = confirm == JvOptionPane.YES_OPTION;