slim: try again

[openpandora.oe.git] / recipes / slim / slim / chvt_on_exit_try2.patch

diff --git a/recipes/slim/slim/chvt_on_exit_try2.patch b/recipes/slim/slim/chvt_on_exit_try2.patch
index 8c846f3..2f2e196 100644 (file)
--- a/recipes/slim/slim/chvt_on_exit_try2.patch
+++ b/recipes/slim/slim/chvt_on_exit_try2.patch
@@ -1,13 +1,13 @@
-diff -ur slim-1.3.1_/main.cpp slim-1.3.1/main.cpp
+diff -u slim-1.3.1_/main.cpp slim-1.3.1/main.cpp
 --- slim-1.3.1_/main.cpp       2008-09-26 03:54:15.000000000 +0300
-+++ slim-1.3.1/main.cpp        2015-07-06 02:40:17.534545611 +0300
++++ slim-1.3.1/main.cpp        2015-07-10 02:29:38.182646783 +0300
 @@ -14,7 +14,13 @@
  
  App* LoginApp = 0;
  
 +static void do_chvt(void)
 +{
-+    system("if [ \"`/sbin/runlevel | awk '{print $2}'`\" = \"5\" ]; then /usr/bin/chvt 1; fi");
++    system("if [ \"`/sbin/runlevel | awk '{print $2}'`\" = \"5\" -a \"`/bin/pidof X`\" = \"\" ]; then /usr/bin/chvt 1; fi");
 +}
 +
  int main(int argc, char** argv) {