Add interrupt to index thread in case it becomes hung.

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / NeverNote.java

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 115a6c9..988ae34 100644 (file)
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -963,8 +963,10 @@ public class NeverNote extends QMainWindow{
                                indexRunner.thread().join(50);
                        if (!indexRunner.thread().isAlive())
                                logger.log(logger.MEDIUM, "Index thread has stopped");
-                       else
-                               logger.log(logger.MEDIUM, "Index thread still running - bypassing");
+                       else {
+                               logger.log(logger.MEDIUM, "Index thread still running - interrupting");
+                               indexRunner.thread().interrupt();
+                       }
                } catch (InterruptedException e1) {
                        e1.printStackTrace();
                }
@@ -3369,6 +3371,22 @@ public class NeverNote extends QMainWindow{
        refreshEvernoteNoteList();
        logger.log(logger.HIGH, "Calling note table reload in NeverNote.noteIndexUpdated() - "+reload);
        noteTableView.load(reload);
+       if (currentNoteGuid == null || currentNoteGuid.equals("")) {
+               int pos;
+               if (noteTableView.proxyModel.sortOrder() == SortOrder.AscendingOrder)
+                       pos = noteTableView.proxyModel.rowCount();
+               else 
+                       pos = 1;
+               if (noteTableView.proxyModel.rowCount() == 0)
+                       pos = 0;
+               if (pos>0)      {
+                       QModelIndex i = noteTableView.proxyModel.index(pos-1, Global.noteTableGuidPosition);
+                       if (i!=null) {
+                               currentNoteGuid = (String)i.data();
+                               noteTableView.selectRow(pos-1);
+                       }
+               }
+       }               
        scrollToGuid(currentNoteGuid);
                logger.log(logger.HIGH, "Leaving NeverNote.noteIndexUpdated");
     }
@@ -3406,14 +3424,10 @@ public class NeverNote extends QMainWindow{
                        browserWindow.setDisabled(true);
                } 
                
-               if (saveCurrentNoteGuid.equals("") && listManager.getNoteIndex().size() > 0) {
-                       currentNote = listManager.getNoteIndex().get(listManager.getNoteIndex().size()-1);
-                       currentNoteGuid = currentNote.getGuid();
-                       refreshEvernoteNote(true);
-               } else {
-                       //we can reload if note not dirty
-//                     refreshEvernoteNote(!noteDirty);
+               if (!saveCurrentNoteGuid.equals("")) {
                        refreshEvernoteNote(false);
+               } else {
+                       currentNoteGuid = "";
                }
                reloadTagTree(false);