Added an error message to -s failing.

SOwOphie · Sep 18, 2016 · 6a680ef · 6a680ef
1 parent 5a04b38
commit 6a680ef
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/WSEdit.hs b/WSEdit.hs
@@ -162,16 +162,28 @@ start = do
                                                          $ drop 5
                                                          $ linesPlus r
 
-                                        conf' = unPrettyEdConfig
-                                                (vtyObj conf)
-                                                (keymap conf)
-                                              $ readNote (fqn "start:1")
+                                        conf' = fmap ( unPrettyEdConfig
+                                                       (vtyObj conf)
+                                                       (keymap conf)
+                                                     )
+                                              $ readMay
                                               $ unlinesPlus cLines
 
-                                        st    = readNote (fqn "start:2")
+                                        st    = readMay
                                               $ unlinesPlus sLines
 
-                                    return (conf', st)
+                                    case (conf', st) of
+                                         (Just c, Just s) -> return (c, s)
+                                         _                -> do
+                                            shutdown v
+
+                                            putStrLn $ "-s: parse error. Are "
+                                                    ++ "you sure you aren't "
+                                                    ++ "trying to open a "
+                                                    ++ "different version's "
+                                                    ++ "dump?"
+
+                                            exitFailure
 
                      else return (conf, def { fname   = fromMaybe "" filename
                                             , loadPos = (tLnNo, tColNo)