X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLog.java;h=6d873d7811576171aa29b63b4daf725c2c4f956b;hp=015d9f65aa13ad28ef3aadef04bcf044becabf12;hb=51bdee662fdfad1937c576daadd2e5eacac17905;hpb=4e22b34bde421a9df090c9196fd4347468c8176a

diff --git a/altoslib/AltosLog.java b/altoslib/AltosLog.java
index 015d9f65..6d873d78 100644
--- a/altoslib/AltosLog.java
+++ b/altoslib/AltosLog.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.text.*;
@@ -48,6 +49,7 @@ public class AltosLog implements Runnable {
 	}
 
 	public void close() {
+		link.remove_monitor(input_queue);
 		close_log_file();
 		if (log_thread != null) {
 			log_thread.interrupt();
@@ -59,21 +61,19 @@ public class AltosLog implements Runnable {
 		return file;
 	}
 
-	boolean open (AltosState state) throws IOException {
+	boolean open (AltosState state) throws IOException, InterruptedException {
 		AltosFile	a = new AltosFile(state);
 
 		log_file = new FileWriter(a, true);
 		if (log_file != null) {
 			while (!pending_queue.isEmpty()) {
-				try {
-					String s = pending_queue.take();
-					log_file.write(s);
-					log_file.write('\n');
-				} catch (InterruptedException ie) {
-				}
+				String s = pending_queue.take();
+				log_file.write(s);
+				log_file.write('\n');
 			}
 			log_file.flush();
 			file = a;
+			AltosPreferences.set_logfile(link.serial, file);
 		}
 		return log_file != null;
 	}