Cherry-picking upstream version 0.9.0+20151019.

This commit is contained in:
Alf Gaida 2015-10-24 00:33:58 +02:00
parent 34bee383b8
commit 647ff4897a
2 changed files with 5 additions and 7 deletions

View File

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

6
debian/changelog vendored
View File

@ -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 <agaida@siduction.org> Sat, 03 Oct 2015 12:06:52 +0200
-- Alf Gaida <agaida@siduction.org> Sat, 24 Oct 2015 00:33:31 +0200
lxqt-globalkeys (0.9.0+20150914-1) experimental; urgency=medium