Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-21 05:39:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1065 from csoler/v0.6-Links2

Browse source 
V0.6 links2
This commit is contained in:
csoler 2017-10-23 22:14:06 +02:00 • committed by GitHub
commit 06f489ec61
30 changed files with 991 additions and 446 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -103,7 +103,7 @@
#include "gui/statistics/StatisticsWindow.h"
#include "gui/connect/ConnectFriendWizard.h"
#include "gui/common/RsCollectionFile.h"
#include "gui/common/RsCollection.h"
#include "settings/rsettingswin.h"
#include "settings/rsharesettings.h"
#include "settings/WebuiPage.h"
@ -1031,7 +1031,7 @@ void MainWindow::newRsCollection()
{
std::vector <DirDetails> dirVec;
RsCollectionFile(dirVec).openNewColl(this);
RsCollection(dirVec).openNewColl(this);
}
/** Shows Share Manager */
@ -1459,8 +1459,8 @@ void MainWindow::openRsCollection(const QString &filename)
{
QFileInfo qinfo(filename);
if (qinfo.exists()) {
if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) {
RsCollectionFile collection;
if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
RsCollection collection;
collection.openColl(qinfo.absoluteFilePath());
}
}