osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Rename a variable that clashes with GLib

This commit is contained in:
João Valverde 2021-06-18 17:01:42 +01:00 committed by Guy Harris
parent 0e50979b3f
commit 145ba2e071
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/qt/search_frame.cpp
View File

@ -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;