[Bf-blender-cvs] [55b7a8c] master: ndof: fix Linux device detect regression

Mike Erwin noreply at git.blender.org
Mon Apr 13 02:00:08 CEST 2015


Commit: 55b7a8c027717c93c74d1a81d66ded9f850ba372
Author: Mike Erwin
Date:   Sun Apr 12 19:58:17 2015 -0400
Branches: master
https://developer.blender.org/rB55b7a8c027717c93c74d1a81d66ded9f850ba372

ndof: fix Linux device detect regression

===================================================================

M	intern/ghost/intern/GHOST_NDOFManagerX11.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
index de44b36..75e476c 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
@@ -43,7 +43,7 @@ GHOST_NDOFManagerX11::GHOST_NDOFManagerX11(GHOST_System& sys)
 #define MAX_LINE_LENGTH 100
 
 		/* look for USB devices with Logitech or 3Dconnexion's vendor ID */
-		FILE *command_output = popen("lsusb | grep '046d:\|256f:'", "r");
+		FILE *command_output = popen("lsusb | grep '046d:\\|256f:'", "r");
 		if (command_output) {
 			char line[MAX_LINE_LENGTH] = {0};
 			while (fgets(line, MAX_LINE_LENGTH, command_output)) {




More information about the Bf-blender-cvs mailing list