From 1ef2229ba43338a53d049d893b6a009635332e28 Mon Sep 17 00:00:00 2001
From: Adam Reichold <adam.reichold@t-online.de>
Date: Sat, 19 Dec 2015 09:18:18 +0100
Subject: [PATCH] Close #3025 by fixing the fully defining the original
 selection function.

---
 rtgui/filebrowser.cc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc
index 7d921b328..8bb1d69bb 100644
--- a/rtgui/filebrowser.cc
+++ b/rtgui/filebrowser.cc
@@ -67,17 +67,19 @@ const Glib::ustring* getOriginalExtension (const ThumbBrowserEntryBase* entry)
 
 ThumbBrowserEntryBase* selectOriginalEntry (ThumbBrowserEntryBase* original, ThumbBrowserEntryBase* candidate)
 {
+    if (original == NULL) {
+        return candidate;
+    }
+
     // The candidate will become the new original, if it has an original extension
     // and if its extension is higher in the list than the old original.
     if (const Glib::ustring* candidateExtension = getOriginalExtension (candidate)) {
-        if (original == NULL) {
-            return candidate;
-        } else if (const Glib::ustring* originalExtension = getOriginalExtension (original)) {
+        if (const Glib::ustring* originalExtension = getOriginalExtension (original)) {
             return candidateExtension < originalExtension ? candidate : original;
         }
-    } else {
-        return original;
     }
+
+    return original;
 }
 
 void findOriginalEntries (const std::vector<ThumbBrowserEntryBase*>& entries)