OSDN Git Service

Merge branch 'development' of ssh://nevernote.git.sourceforge.net/gitroot/nevernote...
authorxVir <danil.skachkov@gmail.com>
Tue, 2 Nov 2010 14:40:15 +0000 (20:40 +0600)
committerxVir <danil.skachkov@gmail.com>
Tue, 2 Nov 2010 14:40:15 +0000 (20:40 +0600)
1  2 
src/cx/fbn/nevernote/NeverNote.java

@@@ -2906,15 -2905,14 +2909,15 @@@ public class NeverNote extends QMainWin
                        browserWindow.setDisabled(true);
                } 
                
 -              if (saveCurrentNoteGuid.equals("") && listManager.getNoteIndex().size() >0) {
 -                      currentNoteGuid = listManager.getNoteIndex().get(listManager.getNoteIndex().size()-1).getGuid();
 +              if (saveCurrentNoteGuid.equals("") && listManager.getNoteIndex().size() > 0) {
                        currentNote = listManager.getNoteIndex().get(listManager.getNoteIndex().size()-1);
 +                      currentNoteGuid = currentNote.getGuid();
                        refreshEvernoteNote(true);
                } else {
 -                      refreshEvernoteNote(false);
 +                      //we can reload if note not dirty
 +                      refreshEvernoteNote(!noteDirty);
                }
-               reloadTagTree();
+               reloadTagTree(false);
  
                logger.log(logger.HIGH, "Leaving NeverNote.refreshEvernoteNoteList");
        }