Make exception handling more user friendly. Not all exceptions are 'errors' (for example, exiting the server intentionally via the window manager's logoff button).

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5021 3789f03b-4d11-0410-bbf8-ca57d06f2519

1 files changed, 11 insertions, 5 deletions

diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java
index cf38760f..ebd90b47 100644
--- a/java/com/tigervnc/vncviewer/VncViewer.java
+++ b/java/com/tigervnc/vncviewer/VncViewer.java
@@ -371,12 +371,18 @@ public class VncViewer extends java.applet.Applet implements Runnable
       while (!cc.shuttingDown)
         cc.processMsg();
     } catch (java.lang.Exception e) {
-      if (cc == null || !cc.shuttingDown) {
+      if (e instanceof EndOfStream) {
+        vlog.info(e.getMessage());
+      } else if (cc == null || !cc.shuttingDown) {
         e.printStackTrace();
-        JOptionPane.showMessageDialog(null,
-          e.toString(),
-          "VNC Viewer : Error",
-          JOptionPane.ERROR_MESSAGE);
+        JOptionPane op = 
+          new JOptionPane(e.getMessage(), JOptionPane.WARNING_MESSAGE);
+        JDialog dlg = op.createDialog("TigerVNC Viewer");
+        ClassLoader cl = this.getClass().getClassLoader();
+        ImageIcon icon = 
+          new ImageIcon(cl.getResource("com/tigervnc/vncviewer/tigervnc.ico"));
+        dlg.setIconImage(icon.getImage());
+        dlg.setVisible(true);
       } else {
         if (!cc.shuttingDown)
           vlog.info(e.toString());