Skip to content
Browse files

Fixed a potential NPE

  • Loading branch information...
1 parent c092b63 commit c8145d926a70160b8d857e250572003d34b4d06b @adrian committed Jan 23, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/com/_17od/upm/gui/DatabaseActions.java
View
4 src/com/_17od/upm/gui/DatabaseActions.java
@@ -118,8 +118,8 @@ public void windowGainedFocus(WindowEvent e) {
// If a "Database to Load on Startup" hasn't been set yet then ask the
// user if they'd like to open this database on startup.
- if (Preferences.get(Preferences.ApplicationOptions.DB_TO_LOAD_ON_STARTUP).equals("") ||
- Preferences.get(Preferences.ApplicationOptions.DB_TO_LOAD_ON_STARTUP) == null) {
+ if (Preferences.get(Preferences.ApplicationOptions.DB_TO_LOAD_ON_STARTUP) == null ||
+ Preferences.get(Preferences.ApplicationOptions.DB_TO_LOAD_ON_STARTUP).equals("")) {
int option = JOptionPane.showConfirmDialog(mainWindow,
Translator.translate("setNewLoadOnStartupDatabase"),
Translator.translate("newPasswordDatabase"),

0 comments on commit c8145d9

Please sign in to comment.
Something went wrong with that request. Please try again.