From 647ff4897aa85f73f956fef2b97e5550be636a0d Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sat, 24 Oct 2015 00:33:58 +0200 Subject: [PATCH] Cherry-picking upstream version 0.9.0+20151019. --- config/main_window.cpp | 6 ++---- debian/changelog | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config/main_window.cpp b/config/main_window.cpp index d6214cf..1297476 100644 --- a/config/main_window.cpp +++ b/config/main_window.cpp @@ -179,10 +179,8 @@ void MainWindow::editAction(const QModelIndex &index) { qulonglong id = 0; - if (!index.isValid()) - return; - - id = mDefaultModel->id(mSortFilterProxyModel->mapToSource(index)); + if (index.isValid()) + id = mDefaultModel->id(mSortFilterProxyModel->mapToSource(index)); if (!mEditActionDialog) mEditActionDialog = new EditActionDialog(mActions, this); diff --git a/debian/changelog b/debian/changelog index fce0127..378fbc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -lxqt-globalkeys (0.9.0+20150926-1) experimental; urgency=medium +lxqt-globalkeys (0.9.0+20151019-1) experimental; urgency=medium - * Cherry-picked upstream version 0.9.0+20150926. + * Cherry-picked upstream version 0.9.0+20151019. * Remove --list-missing from rules, it's included in --fail-missing - -- Alf Gaida Sat, 03 Oct 2015 12:06:52 +0200 + -- Alf Gaida Sat, 24 Oct 2015 00:33:31 +0200 lxqt-globalkeys (0.9.0+20150914-1) experimental; urgency=medium