Kali fixes

Check the new database config location.
Don't crash on sporadic JRE style error.

Author: scriptjunkie

data/gui/msfgui.jar

@@ -244,7 +244,11 @@ private void reloadDefaults(){
 			try{
 				s = new Scanner(new File(System.getenv("BASE")+"config/database.yml"));
 			} catch (FileNotFoundException fnfox){
-				s = new Scanner(new File(MsfguiApp.getMsfRoot()+"/../config/database.yml"));
+				try{
+					s = new Scanner(new File(MsfguiApp.getMsfRoot()+"/../config/database.yml"));
+				} catch (FileNotFoundException fnfx){
+					s = new Scanner(new File("/opt/metasploit/apps/pro/ui/config/database.yml"));
+				}
 			}
 			String token = s.next();
 			while(!token.equals("production:"))

external/source/gui/msfguijava/src/msfgui/DbConnectDialog.java

@@ -366,14 +366,19 @@ private void expandList(List mlist, JMenu rootMenu, RunMenuFactory factory, Stri
 					currentMenu.add(men);
 					currentMenu = (JMenu) men;
 				} else {
-					JMenuItem men = new JMenuItem(names[i]);
-					if(recentlyAdded)
-						men.setFont(men.getFont().deriveFont(men.getFont().getStyle() | java.awt.Font.BOLD));
-					men.setName(names[i]);
-					currentMenu.add(men);
-					ActionListener actor = factory.getActor(fullName.toString(),type,rpcConn);
-					men.addActionListener(actor);
-					searchWin.modules.add(new Object[]{type, fullName.toString(),actor});
+					try{
+						JMenuItem men = new JMenuItem(names[i]);
+						if(recentlyAdded)
+							men.setFont(men.getFont().deriveFont(men.getFont().getStyle() | java.awt.Font.BOLD));
+						men.setName(names[i]);
+						currentMenu.add(men);
+						ActionListener actor = factory.getActor(fullName.toString(),type,rpcConn);
+						men.addActionListener(actor);
+						searchWin.modules.add(new Object[]{type, fullName.toString(),actor});
+					}catch(ClassCastException cce){
+						System.err.println(names[i]);
+						cce.printStackTrace();
+					}
 				}
 			}//end for each subname
 		}//end for each module