From 6c4d1c34e373b62745998a6c5936107f833f596e Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 4 Oct 2018 18:49:27 +0200 Subject: [PATCH] fixed removal of "share on channel"/"share on forum" menu entries in own files --- retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp index c1ba31b50..58effb773 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp @@ -1146,10 +1146,12 @@ void LocalSharedFilesDialog::spawnCustomPopupMenu( QPoint point ) return ; } + QMenu shareChannelMenu(tr("Share on channel...")) ; // added here because the shareChannelMenu QMenu object is deleted afterwards + QMenu shareForumMenu(tr("Share on forum...")) ; // added here because the shareChannelMenu QMenu object is deleted afterwards + if(type != DIR_TYPE_EXTRA_FILE) { GxsChannelDialog *channelDialog = dynamic_cast(MainWindow::getPage(MainWindow::Channels)); - QMenu shareChannelMenu(tr("Share on channel...")) ; // added here because the shareChannelMenu QMenu object is deleted afterwards if(channelDialog != NULL) { @@ -1173,7 +1175,6 @@ void LocalSharedFilesDialog::spawnCustomPopupMenu( QPoint point ) } GxsForumsDialog *forumsDialog = dynamic_cast(MainWindow::getPage(MainWindow::Forums)); - QMenu shareForumMenu(tr("Share on forum...")) ; // added here because the shareChannelMenu QMenu object is deleted afterwards if(forumsDialog != NULL) {