commit 77431c12d105f96a2e9dd2fd440c95e369101d59
author Jesse MacFadyen <purplecabbage@gmail.com> Wed Mar 27 16:36:03 2013 -0700
committer Jesse MacFadyen <purplecabbage@gmail.com> Wed Mar 27 16:36:03 2013 -0700
tree 3ca1844f1a53970e385dc26c255d2a2b536d3bdd
parent 80937680d3030f0e965f12d72c88daa4c1883fc4
parent 8df8c7c219a0e813e03e1b429b61e70c3607e80c

Merge branch 'master' of github.com:purplecabbage/cordova-wp7

templates/standalone/cordovalib/NativeExecution.cs

diff --git a/templates/standalone/cordovalib/NativeExecution.cs b/templates/standalone/cordovalib/NativeExecution.cs
index 25efd01..c0d768e 100644
--- a/templates/standalone/cordovalib/NativeExecution.cs
+++ b/templates/standalone/cordovalib/NativeExecution.cs
@@ -145,7 +145,7 @@
             catch (Exception ex)
             {
                 // ERROR
-                Debug.WriteLine(String.Format("ERROR: Unable to execute command :: {0}:{1}:{3} ",
+                Debug.WriteLine(String.Format("ERROR: Unable to execute command :: {0}:{1}:{2} ",
                     commandCallParams.Service, commandCallParams.Action, ex.Message));
 
                 this.OnCommandResult(commandCallParams.CallbackId, new PluginResult(PluginResult.Status.ERROR));

tooling/CordovaDeploy/CordovaDeploy/Program.cs

diff --git a/tooling/CordovaDeploy/CordovaDeploy/Program.cs b/tooling/CordovaDeploy/CordovaDeploy/Program.cs
index a862227..f8e1bdd 100644
--- a/tooling/CordovaDeploy/CordovaDeploy/Program.cs
+++ b/tooling/CordovaDeploy/CordovaDeploy/Program.cs
@@ -126,7 +126,7 @@
                 ListDevices();
                 return;
             }
-            else if (args[1].StartsWith("-d:"))
+            else if (args.Length > 1 && args[1].StartsWith("-d:"))
             {
                 deviceIndex = int.Parse(args[1].Substring(3));
             }