Changeset 240

Timestamp:

11/13/02 01:06:13 (21 years ago)

Author:

piso

Message:

activate(): removed incorrect assertion. When restoring a named session, the
old buffer will no longer be in the buffer list when activate() is called.
Fixes bug 637460.

File:

• trunk/j/src/org/armedbear/j/Editor.java (modified) (5 diffs)

trunk/j/src/org/armedbear/j/Editor.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: Editor.java,v 1.16 2002-11-05 15:35:53 piso Exp $
+ * $Id: Editor.java,v 1.17 2002-11-13 01:06:13 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -3953 +3953 @@
             buf.readOnly = !buf.readOnly;
             changed = true;
-            // Let the user know if the file associated with a modified buffer 
+            // Let the user know if the file associated with a modified buffer
             // is no longer writable.
             if (buf.readOnly && buf.isLoaded() && buf.isModified())
@@ -5713 +5713 @@
     public void activate(Buffer buf)
     {
-        if (buffer != null)
-            Debug.assertTrue(bufferList.contains(buffer));
         if (buf == null)
             return;
@@ -5723 +5721 @@
             buf.initialize();
         clearStatusText();
-        if (buffer != null) {
+        if (buffer != null && bufferList.contains(buffer)) {
             // Save information about buffer being deactivated.
             buffer.autosave();
@@ -6150 +6148 @@
             setFocusToTextField();
     }
-    
+
     private static Method evaluateMethod;