From 19bd43d367d0fa6237b4c4a1052ca028428b5d4c Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Tue, 22 Oct 2013 20:55:47 -0600
Subject: [PATCH] Fixed small bugs with "idlepc get" command and Ethernet
 switch auto port allocation. Dynamips 0.2.10 by default on OSX.

---
 CHANGELOG                   | 11 +++++++++++
 src/GNS3/Config/Defaults.py |  4 ++--
 src/GNS3/Console.py         |  2 +-
 src/GNS3/Node/ETHSW.py      |  2 ++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 36af76e2..5b1c0761 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,17 @@
 # GNS3 - CHANGELOG #
 ####################
 
+=== v0.8.6 22.10.2013 ===
+
+    * Windows version now supports VirtualBox 4.3 and still works with 4.2.x
+    * Fixed the broken snapshot feature.
+    * Host devices don't automatically add tap interfaces in the generic Ethernet NIO list anymore.
+    * Auto open for instructions files when opening the topology via the command line, a file explorer or a drag & drop on the workspace.
+    * Modified the default Etherswitch configuration (renamed some macros + added vtp file nvram:vlan.dat)
+    * Fixed small bugs with "idlepc get" command and Ethernet switch auto port allocation.
+    * Added wpcap.dll to the Windows standalone versions.
+    * Dynamips 0.2.10 is now the default on OSX.
+
 === v0.8.5 09.09.2013 ===
 
     * Dynamips 0.2.10 is included in our Windows all-in-one package and OSX DMG, this version allows Crypto keys to be saved and it fixes a bug that prevented startup-configs to be loaded by c3745 IOS. Hooray!
diff --git a/src/GNS3/Config/Defaults.py b/src/GNS3/Config/Defaults.py
index eaeb0ff1..1acb52be 100644
--- a/src/GNS3/Config/Defaults.py
+++ b/src/GNS3/Config/Defaults.py
@@ -26,9 +26,9 @@
     DYNAMIPS_DEFAULT_PATH = unicode('dynamips.exe')
 elif sys.platform.startswith('darwin'):
     if hasattr(sys, "frozen"):
-        DYNAMIPS_DEFAULT_PATH = os.getcwdu() + os.sep + '../Resources/dynamips-0.2.8-RC3-community-OSX.intel64.bin'
+        DYNAMIPS_DEFAULT_PATH = os.getcwdu() + os.sep + '../Resources/dynamips-0.2.10-OSX.intel64.bin'
     else:
-        DYNAMIPS_DEFAULT_PATH = os.getcwdu() + os.sep + 'dynamips-0.2.8-RC3-community-OSX.intel64.bin'
+        DYNAMIPS_DEFAULT_PATH = os.getcwdu() + os.sep + 'dynamips-0.2.10-OSX.intel64.bin'
 else:
     DYNAMIPS_DEFAULT_PATH = unicode('dynamips')
 
diff --git a/src/GNS3/Console.py b/src/GNS3/Console.py
index 5bf869ef..082d5f7e 100644
--- a/src/GNS3/Console.py
+++ b/src/GNS3/Console.py
@@ -453,7 +453,7 @@ def do_idlepc(self, args):
                 device = params[0]
                 if command == 'get':
                     current_idlepc = self.dynagen.devices[device].idlepc
-                    if len(params) < 2 or params[1] != 'force' and current_idlepc != None:
+                    if (len(params) < 2 or params[1] != 'force') and current_idlepc:
                         print translate("Console", "%s already has an idlepc value applied (%s).") % (device, current_idlepc)
                         return
 
diff --git a/src/GNS3/Node/ETHSW.py b/src/GNS3/Node/ETHSW.py
index b3b6479d..3e0a0df4 100644
--- a/src/GNS3/Node/ETHSW.py
+++ b/src/GNS3/Node/ETHSW.py
@@ -163,6 +163,8 @@ def autoAllocateFreePort(self):
                 self.config['vlans'][1] = []
             else:
                 port = max(self.config['ports']) + 1
+                if not self.config['vlans'].has_key(1):
+                    self.config['vlans'][1] = []
             self.config['ports'][port] = 'access'
             self.config['vlans'][1].append(port)