Lockscreen now gets restarted if it crashes. Fixes #6

Cargo.toml

@@ -10,7 +10,7 @@ build = "build.rs"
 [dependencies]
 dbus = "0.3"
 libc = "0.2"
-config-parser = "0.1"
+config-parser = "0.1.0"
 
 [[bin]]
 name = "lockd"

src/daemon.rs

@@ -372,6 +372,11 @@ fn actor_main(handles: ActorMainHandles, inbox: Receiver<CoreMessage>) {
                     }
                 };
                 apply_config(&config, &handles, &mut state);
+            },
+            CoreMessage::LockCrashed => {
+                state.locking = true;
+                state.locked = false;
+                handles.lockscreen.send(LockMessage::Lock).unwrap();
             }
 
         }

src/lockscreen.rs

@@ -42,6 +42,9 @@ fn lock_command(command: &(String, Vec<String>)) -> Child {
 }
 
 fn actor_lock_instance(core: Sender<CoreMessage>, mut child: Child) {
-    child.wait().unwrap();
-    core.send(CoreMessage::Unlocked).unwrap();
+    if child.wait().unwrap().success() {
+        core.send(CoreMessage::Unlocked).unwrap();
+    } else {
+        core.send(CoreMessage::LockCrashed).unwrap();
+    }
 }

src/msg.rs

@@ -27,7 +27,8 @@ pub enum CoreMessage {
   Suspended,
   QueryFlag(CoreFlag, Sender<bool>),
   AutoLock,
-  SetAutoLock(bool)
+  SetAutoLock(bool),
+  LockCrashed
 }
 
 impl fmt::Debug for CoreMessage {
@@ -42,6 +43,7 @@ impl fmt::Debug for CoreMessage {
             CoreMessage::Suspending => write!(f, "Suspending"),
             CoreMessage::Suspended => write!(f, "Suspended"),
             CoreMessage::ReloadConfig => write!(f, "ReloadConfig"),
+            CoreMessage::LockCrashed => write!(f, "LockCrashed"),
 
             CoreMessage::SuspendOnLid(flag) => {
                 write!(f, "SuspendOnLid({:?})", flag)