[vlc-commits] Revert "RC: try the vlm commands later in the process"

Pierre Ynard git at videolan.org
Sun Oct 16 18:17:24 CEST 2011


vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Sun Oct 16 18:08:43 2011 +0200| [9b4e85b66d40b94678ddbec2d9ea25e4a6625191] | committer: Pierre Ynard

Revert "RC: try the vlm commands later in the process"

This reverts commit d570f62ed93dd45253ad1a646d43acc58a733a8c.
It causes more spurious messages than not.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b4e85b66d40b94678ddbec2d9ea25e4a6625191
---

 share/lua/intf/cli.lua |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/lua/intf/cli.lua b/share/lua/intf/cli.lua
index c42d632..b8a0b7a 100644
--- a/share/lua/intf/cli.lua
+++ b/share/lua/intf/cli.lua
@@ -697,11 +697,11 @@ function client_command( client )
     elseif string.sub(cmd,0,1)=='@'
     and call_object_command(string.sub(cmd,2,#cmd),client,arg) == 0 then
         --
+    elseif call_vlm_command(cmd,client,arg) == 0 then
+        --
     elseif client.type == host.client_type.stdio
     and call_libvlc_command(cmd,client,arg) == 0 then
         --
-    elseif call_vlm_command(cmd,client,arg) == 0 then
-        --
     else
         local choices = {}
         if client.env.autocompletion ~= 0 then



More information about the vlc-commits mailing list