Correct problem viewing & restoring deleted notes and correct a problem where a null...

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 19e33a3..422fe4c 100644 (file)
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -980,7 +980,8 @@ public class NeverNote extends QMainWindow{
                waitCursor(true);
                
                if (currentNote!= null & browserWindow!=null) {
-                       if (!currentNote.getTitle().equals(browserWindow.getTitle()))
+                       if (currentNote.getTitle() != null && browserWindow != null 
+                                       && !currentNote.getTitle().equals(browserWindow.getTitle()))
                                conn.getNoteTable().updateNoteTitle(currentNote.getGuid(), browserWindow.getTitle());
                }
                saveNote();
@@ -3262,8 +3263,8 @@ public class NeverNote extends QMainWindow{
                menuBar.noteRestoreAction.setVisible(false);
        }
        else {
+               trashNoteGuid = tempGuid;
                currentNoteGuid = trashNoteGuid;
-                       trashNoteGuid = tempGuid;
                menuBar.noteRestoreAction.setEnabled(true);
                menuBar.noteRestoreAction.setVisible(true);
                Global.showDeleted = true;
@@ -3700,10 +3701,16 @@ public class NeverNote extends QMainWindow{
                        browserWindow.setDisabled(true);
                } 
                
+               if (Global.showDeleted && listManager.getNotebookIndex().size() > 0 && saveCurrentNoteGuid.equals("")) {
+                       currentNoteGuid = listManager.getNoteIndex().get(0).getGuid();
+                       saveCurrentNoteGuid = currentNoteGuid;
+                       refreshEvernoteNote(true);
+               }
+               
                if (!saveCurrentNoteGuid.equals("")) {
                        refreshEvernoteNote(false);
                } else {
-                       currentNoteGuid = "";
+                               currentNoteGuid = "";
                }
                reloadTagTree(false);
 
@@ -4380,7 +4387,6 @@ public class NeverNote extends QMainWindow{
                Global.cryptCounter =0;
                if (readOnly) {
                        browserWindow.setReadOnly(true);
-                       return;
                }
                
                if (!reload)

diff --git a/src/cx/fbn/nevernote/sql/NoteTable.java b/src/cx/fbn/nevernote/sql/NoteTable.java
index 2cfeb45..660b793 100644 (file)
--- a/src/cx/fbn/nevernote/sql/NoteTable.java
+++ b/src/cx/fbn/nevernote/sql/NoteTable.java
@@ -566,9 +566,10 @@ public class NoteTable {
        }\r
        public void restoreNote(String guid) {\r
         NSqlQuery query = new NSqlQuery(db.getConnection());\r
-               query.prepare("Update Note set deleted='1969-12-31 19.00.00', active=true, isDirty=true where guid=:guid");\r
+               query.prepare("Update Note set deleted=:reset, active=true, isDirty=true where guid=:guid");\r
 //             query.prepare("Update Note set deleted=0, active=true, isDirty=true where guid=:guid");\r
                query.bindValue(":guid", guid);\r
+               query.bindValue(":reset", "1969-12-31 19:00:00");\r
                if (!query.exec()) {\r
                        logger.log(logger.MEDIUM, "Note restore failed.");\r
                        logger.log(logger.MEDIUM, query.lastError());\r