2004-05-11 Pierre-Luc Paour <gallery@paour.com> (1.4-b11)

* Fixed NPE when leaving slideshow applet.
gallery · May 11, 2004 · 66a6163 · 66a6163
1 parent d7f6190
commit 66a6163
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-11  Pierre-Luc Paour <gallery@paour.com> (1.4-b11)
+
+	* Fixed NPE when leaving slideshow applet.
+
 2004-05-11  Pierre-Luc Paour <gallery@paour.com> (1.4-b10)
 
 	* Fixed upload (and slideshow) applets when Gallery is embedded in a CMS.

diff --git a/com/gallery/GalleryRemote/GRAppletMini.java b/com/gallery/GalleryRemote/GRAppletMini.java
@@ -104,8 +104,12 @@ public void startup() {
 	}
 
 	public void shutdown() {
-		if (hasStarted) {
-			GalleryRemote._().properties.setIntProperty(APPLET_DIVIDER_LOCATION, jDivider.getDividerLocation());
+		if (hasStarted && GalleryRemote._() != null) {
+			// this is also executed from GRAppletSlideshow
+			if (jDivider != null) {
+				GalleryRemote._().properties.setIntProperty(APPLET_DIVIDER_LOCATION, jDivider.getDividerLocation());
+			}
+
 			GalleryRemote._().properties.write();
 			GalleryRemote.shutdownInstance();
 		}

diff --git a/com/gallery/GalleryRemote/GRAppletSlideshow.java b/com/gallery/GalleryRemote/GRAppletSlideshow.java
@@ -111,9 +111,9 @@ public void actionPerformed(ActionEvent e) {
 	}
 
 	public void shutdown() {
-		if (hasStarted) {
+		if (hasStarted && GalleryRemote._() != null) {
 			jSlidePanel.writeProperties(GalleryRemote._().properties);
-			GalleryRemote._().properties.write();
+			//GalleryRemote._().properties.write();
 		}
 
 		super.shutdown();

diff --git a/defaults.properties b/defaults.properties
@@ -198,6 +198,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.4-b10
+version=1.4-b11
 releaseDate=2004/05/11
 aboutText=Gallery Remote\n \n \nA part of the Gallery Open-Source Project\nhttp://gallery.sourceforge.net\n \n \nMaintained by:\n \nPierre-Luc Paour\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\nAmedeo Paglione\nChris Schwerdt\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJSX\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor