From 7f53f361504ab9f667cfe93fbada419e40858925 Mon Sep 17 00:00:00 2001 From: Matt Weeks Date: Sun, 14 Nov 2010 20:12:20 +0000 Subject: [PATCH] Sanity check on connecting. Also IDE update. git-svn-id: file:///home/svn/framework3/trunk@11043 4d416f70-5f16-0410-b530-b9f4589650da --- data/gui/msfgui.jar | Bin 686824 -> 686996 bytes .../gui/msfguijava/nbproject/build-impl.xml | 7 +++++-- .../msfguijava/nbproject/genfiles.properties | 4 ++-- .../src/msfgui/OpenConnectionDialog.java | 5 +++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/data/gui/msfgui.jar b/data/gui/msfgui.jar index 503a5197544e7fde34f09acc13e46b814d1a57bc..3535ceb935bce37996d139146b64d9b11288c96b 100644 GIT binary patch delta 8262 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 F{s{+>TfqPT delta 8109 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 Xd!=KESt3)!Lt9ws>^V#S?FINhP(~^Y diff --git a/external/source/gui/msfguijava/nbproject/build-impl.xml b/external/source/gui/msfguijava/nbproject/build-impl.xml index 08939472d3..77c156c1d4 100644 --- a/external/source/gui/msfguijava/nbproject/build-impl.xml +++ b/external/source/gui/msfguijava/nbproject/build-impl.xml @@ -291,15 +291,18 @@ is divided into following sections: Must set javac.includes - + + + - + + diff --git a/external/source/gui/msfguijava/nbproject/genfiles.properties b/external/source/gui/msfguijava/nbproject/genfiles.properties index ebe892d8ff..f32300bd62 100644 --- a/external/source/gui/msfguijava/nbproject/genfiles.properties +++ b/external/source/gui/msfguijava/nbproject/genfiles.properties @@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.38.1.45 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=84c180dd -nbproject/build-impl.xml.script.CRC32=49dce8a6 -nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45 +nbproject/build-impl.xml.script.CRC32=0dcf2878 +nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45 diff --git a/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.java b/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.java index 2732b797d5..768eabacff 100644 --- a/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.java +++ b/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.java @@ -30,6 +30,11 @@ public class OpenConnectionDialog extends javax.swing.JDialog { } public static RpcConnection getConnection(MainFrame mainframe) { + if(mainframe.rpcConn != null){ + JOptionPane.showMessageDialog(mainframe.getFrame(), "You are already connected!\n" + + "Exit before making a new connection."); + throw new RuntimeException("Already connected"); + } //try saved connection credentials try{ Map info = MsfguiApp.getPropertiesNode();