branch: elpa/hyperdrive
commit d19023043437273e774773de70929241c19b5d08
Author: Joseph Turner <[email protected]>
Commit: Joseph Turner <[email protected]>
Fix: (h/start, h/stop) Check starting/stopping timers first
When h/gateway-stop-function is set to the default, immediately after
h/stop returns, h//gateway-stopping-timer will be non-nil even though
the gateway is neither ready nor live.
---
hyperdrive.el | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/hyperdrive.el b/hyperdrive.el
index aedc2feed7..e270ea947a 100644
--- a/hyperdrive.el
+++ b/hyperdrive.el
@@ -96,14 +96,16 @@ Calls function set in option
`hyperdrive-gateway-start-function',
which see."
(interactive)
(let ((gateway-installed-p (h/gateway-installed-p)))
- (cond ((and (h//gateway-ready-p) (h/gateway-live-p))
- (h/user-error "Gateway already running"))
- ((h//gateway-ready-p)
- (h/user-error "Gateway already running outside of Emacs."))
- (h//gateway-stopping-timer
+ (cond (h//gateway-stopping-timer
(h/user-error "Wait for gateway to stop before starting"))
(h//gateway-starting-timer
(h/user-error "Gateway already starting"))
+ ((and (h//gateway-ready-p) (h/gateway-live-p))
+ (h/user-error "Gateway already running"))
+ ((h/gateway-live-p)
+ (h/user-error "Gateway process currently live"))
+ ((h//gateway-ready-p)
+ (h/user-error "Gateway already running outside of Emacs."))
((and (not gateway-installed-p) (h/gateway-installing-p))
(h/user-error "Gateway installation in-progress"))
((not gateway-installed-p)
@@ -123,10 +125,10 @@ Calls function set in option
`hyperdrive-gateway-stop-function',
which see."
(interactive)
(cond
- ((and (not (h//gateway-ready-p)) (not (h/gateway-live-p)))
- (h/user-error "Gateway already stopped"))
(h//gateway-stopping-timer
(h/user-error "Gateway already stopping"))
+ ((and (not (h//gateway-ready-p)) (not (h/gateway-live-p)))
+ (h/user-error "Gateway already stopped"))
(t
(funcall h/gateway-stop-function)))
;; Cancel starting timer after calling h/gateway-stop-function since
