From 145ba2e0715bee87f13811a8be31f1aed5efe9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Fri, 18 Jun 2021 17:01:42 +0100 Subject: [PATCH] Rename a variable that clashes with GLib --- ui/qt/search_frame.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/qt/search_frame.cpp b/ui/qt/search_frame.cpp index 0e179b8705..db598f93d6 100644 --- a/ui/qt/search_frame.cpp +++ b/ui/qt/search_frame.cpp @@ -154,12 +154,12 @@ bool SearchFrame::regexCompile() return false; } - GError *g_error = nullptr; + GError *error = nullptr; regex_ = g_regex_new(sf_ui_->searchLineEdit->text().toUtf8().constData(), - (GRegexCompileFlags)flags, (GRegexMatchFlags) 0, &g_error); - if (g_error) { - regex_error_ = g_error->message; - g_error_free(g_error); + (GRegexCompileFlags)flags, (GRegexMatchFlags) 0, &error); + if (error) { + regex_error_ = error->message; + g_error_free(error); } return regex_ ? true : false;