From 8ee069be658503d2711df46bf9a49faeaa490688 Mon Sep 17 00:00:00 2001
From: Massimo Di Pierro <massimo.dipierro@gmail.com>
Date: Thu, 10 May 2012 22:30:45 -0500
Subject: [PATCH] gracefully handle if a server is already running on the
 selected port, thanks Marc

---
 VERSION         |  2 +-
 gluon/widget.py | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index b34cf2b0..821dd8f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.7 (2012-05-10 22:29:01) dev
+Version 1.99.7 (2012-05-10 22:30:42) dev
diff --git a/gluon/widget.py b/gluon/widget.py
index f1feb775..8b24ed97 100644
--- a/gluon/widget.py
+++ b/gluon/widget.py
@@ -403,6 +403,11 @@ class web2pyDialog(object):
             self.button_start.configure(state='normal')
             return self.error(str(e))
 
+        if not self.server_ready():
+            self.button_start.configure(state='normal')
+            tkMessageBox.showerror('web2py start server', 'server didn\'t start - check console')
+            return
+
         self.button_stop.configure(state='normal')
 
         if not options.taskbar:
@@ -415,6 +420,13 @@ class web2pyDialog(object):
         if self.tb:
             self.tb.SetServerRunning()
 
+    def server_ready(self):
+        for listener in self.server.server.listeners:
+            if listener.ready:
+                return True
+
+        return False
+
     def stop(self):
         """ Stop web2py server """