public static boolean automaticLogin() {
try {
settings.beginGroup("General");
- String text = (String)settings.value("automaticLogin", "false");
+ String text = (String)settings.value("automaticLogin", "true");
settings.endGroup();
if (text.equalsIgnoreCase("true"))
return true;
else
return false;
} catch (java.lang.ClassCastException e) {
- Boolean value = (Boolean) settings.value("automaticLogin", false);
+ Boolean value = (Boolean) settings.value("automaticLogin", true);
settings.endGroup();
return value;
}
int tagDeadCount=0; // number of consecutive dead times for the tag thread
int trashDeadCount=0; // number of consecutive dead times for the trash thread
int saveThreadDeadCount=0; // number of consecutive dead times for the save thread
+ int enRelatedNotesThreadDeadCount=0; // number of consecutive dead times for the EvernoteRelatedNotes Thread
boolean disableTagThreadCheck=false;
boolean disableNotebookThreadCheck=false;
boolean disableTrashThreadCheck=false;
boolean disableSaveThreadCheck=false;
boolean disableSyncThreadCheck=false;
boolean disableIndexThreadCheck=false;
+ boolean disableENRelatedNotesThreadCheck=false;
HashMap<String, String> noteCache; // Cash of note content
HashMap<String, Boolean> readOnlyCache; // List of cashe notes that are read-only
} else
indexThreadDeadCount=0;
-
+ if (!rensoNoteList.getEnRelatedNotesThread().isAlive()) {
+ enRelatedNotesThreadDeadCount++;
+ if (enRelatedNotesThreadDeadCount > MAX && !disableENRelatedNotesThreadCheck) {
+ QMessageBox.information(this, tr("A thread has died."), tr("It appears as the Evernote Related Notes thread has died. I recommend "+
+ "checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry."));
+ disableENRelatedNotesThreadCheck = true;
+ }
+ } else
+ enRelatedNotesThreadDeadCount=0;
}
private void thumbnailTimer() {
noteDuplicateAction = new QAction(tr("Duplicate"), this);
noteDuplicateAction.setToolTip(tr("Duplicate this note"));
noteDuplicateAction.triggered.connect(parent, "duplicateNote()");
- setupShortcut(noteReindex, "File_Note_Duplicate");
+ // IFIXED
+ setupShortcut(noteDuplicateAction, "File_Note_Duplicate");
noteMergeAction = new QAction(tr("Merge Notes"), this);
noteMergeAction.setToolTip(tr("Merge Multiple notes"));
this.enRelatedNotesRunner = new ENRelatedNotesRunner(this.syncRunner, logger);
this.enRelatedNotesRunner.enRelatedNotesSignal.getENRelatedNotesFinished.connect(this, "enRelatedNotesComplete()");
this.enRelatedNotesThread = new QThread(enRelatedNotesRunner, "ENRelatedNotes Thread");
- this.enRelatedNotesThread.start();
+ this.getEnRelatedNotesThread().start();
rensoNoteListItems = new HashMap<QListWidgetItem, String>();
rensoNoteListTrueItems = new ArrayList<RensoNoteListItem>();
}
return false;
}
+
+ public QThread getEnRelatedNotesThread() {
+ return enRelatedNotesThread;
+ }
}