diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java index f10ad14fb4..3d697d7de0 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -76,7 +76,8 @@ public class Case implements SleuthkitCase.ErrorObserver, SleuthkitCase.Sleuthki private static final String autopsyVer = Version.getVersion(); // current version of autopsy. Change it when the version is changed private static final String EVENT_CHANNEL_NAME = "%s-Case-Events"; private static String appName = null; - + private static boolean firstTime=true; + /** * Name for the property that determines whether to show the dialog at * startup @@ -229,7 +230,11 @@ public class Case implements SleuthkitCase.ErrorObserver, SleuthkitCase.Sleuthki */ private void init() { db.addErrorObserver(this); - db.addSleuthkitCaseErrorObserver(this); + if(firstTime) + { + firstTime=false; + db.addSleuthkitCaseErrorObserver(this); + } } /** diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java index 82584797f1..4dd63ca497 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java @@ -49,7 +49,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener { caseNameTextField.getDocument().addDocumentListener(this); caseParentDirTextField.getDocument().addDocumentListener(this); CaseDbConnectionInfo info = UserPreferences.getDatabaseConnectionInfo(); - if (info.getDbType() == DbType.UNKNOWN) { + if (info.getDbType() == DbType.SQLITE) { rbSingleUserCase.setSelected(true); rbSingleUserCase.setEnabled(false); rbMultiUserCase.setEnabled(false); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java index 96e9a40442..e187937f43 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java @@ -99,7 +99,7 @@ import org.sleuthkit.datamodel.TskData.DbType; //TODO fix for local CaseType currentCaseType = CaseType.fromString(ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, ModuleSettings.CURRENT_CASE_TYPE)); CaseDbConnectionInfo info = UserPreferences.getDatabaseConnectionInfo(); - if ((currentCaseType==CaseType.SINGLE_USER_CASE) || ((info.getDbType() != DbType.UNKNOWN) && info.settingsValid())) { + if ((currentCaseType==CaseType.SINGLE_USER_CASE) || ((info.getDbType() != DbType.SQLITE) && info.settingsValid())) { AddImageAction addImageAction = SystemAction.get(AddImageAction.class); addImageAction.actionPerformed(null); } else { diff --git a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java index 3051ca840a..eb8da0234c 100755 --- a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java +++ b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java @@ -111,7 +111,7 @@ public final class UserPreferences { try { dbType = DbType.valueOf(preferences.get(EXTERNAL_DATABASE_TYPE, "UNKOWN")); } catch (Exception ex) { - dbType = DbType.UNKNOWN; + dbType = DbType.SQLITE; } return new CaseDbConnectionInfo( preferences.get(EXTERNAL_DATABASE_HOSTNAME_OR_IP, ""), diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java index 4efe297203..a5c586ae72 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java @@ -398,7 +398,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel { tbIndexingServerPort.setText(indexingServerPort); } - if (dbInfo.getDbType() == DbType.UNKNOWN) { + if (dbInfo.getDbType() == DbType.SQLITE) { cbEnableMultiUser.setSelected(false); } else { cbEnableMultiUser.setSelected(true); @@ -420,7 +420,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel { void store() { - DbType dbType = DbType.UNKNOWN; + DbType dbType = DbType.SQLITE; if (cbEnableMultiUser.isSelected()) { dbType = DbType.POSTGRESQL;