         
         let newState: IncidentState
         switch selectedState {
-        case .New       : newState = .New
-        case .OnHold    : newState = .OnHold
-        case .Dispatched: newState = .Dispatched
-        case .OnScene   : newState = .OnScene
-        case .Closed    : newState = .Closed
-        }
-        
-        if newState == oldState { return }
+            case .New       : newState = .New
+            case .OnHold    : newState = .OnHold
+            case .Dispatched: newState = .Dispatched
+            case .OnScene   : newState = .OnScene
+            case .Closed    : newState = .Closed
+        }
+        
+        if newState == incident!.state { return }
         
         logDebug("State changed to: \(newState)")
         

    @IBAction func editState(sender: AnyObject?) {
        defer { updateView() }

        let oldState: IncidentState
        if let state = incident!.state { oldState = state } else { oldState = .New }
        
        guard let selectedTag = statePopUp!.selectedItem?.tag else {
            logError("Unable to get selected state tag")
            return

        
        let newPriority: IncidentPriority
        switch selectedPriority {
            case .High  : newPriority = .High
            case .Normal: newPriority = .Normal
            case .Low   : newPriority = .Low
        }
        
        if newPriority == incident!.priority { return }
        
        logDebug("Priority changed to: \(newPriority)")
        
