Merging upstream version 4.2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 3 deletions

diff --git a/ui/commandline.c b/ui/commandline.c
index 374434e8..43c2fdc1 100644
--- a/ui/commandline.c
+++ b/ui/commandline.c
@@ -456,9 +456,12 @@ void commandline_override_prefs(int argc, char *argv[], gboolean opt_reset)
                         }
                         break;
                     case PREFS_SET_OBSOLETE:
-                        cmdarg_err("-o flag \"%s\" specifies obsolete preference",
-                                   ws_optarg);
-                        exit_application(1);
+                    /* obsolete preference, might be a recent setting */
+                        if (recent_set_arg(ws_optarg) != PREFS_SET_OK) {
+                            cmdarg_err("-o flag \"%s\" specifies obsolete preference",
+                                       ws_optarg);
+                            exit_application(1);
+                        }
                         break;
                     default:
                         ws_assert_not_reached();