From: Kaj-Michael Lang <milang@onion.tal.org>
Date: Thu, 24 Jan 2008 16:25:08 +0000 (+0200)
Subject: Fix enabling gps
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af41d979c4f655af60b4cc5ebc940625ac39a0dd;p=mapper

Fix enabling gps
---

diff --git a/src/cb.c b/src/cb.c
index bcb2ab6..494b0f4 100644
--- a/src/cb.c
+++ b/src/cb.c
@@ -433,9 +433,11 @@ gboolean
 menu_cb_enable_gps(GtkAction * action)
 {
 if ((_enable_gps = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)))) {
+	if (_gps->io.address) {
 		gps_conn_set_state(_gps, RCVR_DOWN);
-	if (gps_connect_now(_gps)==FALSE) {
-		popup_error(_window, _("Cannot enable GPS until a GPS Receiver MAC is set in the Settings dialog box."));
+		gps_connect_now(_gps);
+	} else {
+		popup_error(_window, _("Cannot enable GPS until a GPS Receiver has been configured in the GPS Settings dialog."));
 		set_action_activate("gps_enabled", FALSE);
 	}
 } else {