easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cmabroadcast crash.

Browse Source 
Sort files by time.
This commit is contained in:
codestation
2015-02-15 13:38:00 -04:30
parent 8af9c7c56d
commit d7a32d30d2
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmaclient.cpp
View File

@@ -92,13 +92,15 @@ void CmaClient::connectWireless()
setActive(true); setActive(true);
broadcast = new CmaBroadcast(this); CmaBroadcast *broadcast = new CmaBroadcast(this);
do { do {
qDebug("Waiting for wireless connection"); qDebug("Waiting for wireless connection");
if((vita = VitaMTP_Get_First_Wireless_Vita(&host, 0, CC::deviceRegistered, CC::generatePin, CC::registrationComplete)) != NULL) { if((vita = VitaMTP_Get_First_Wireless_Vita(&host, 0, CC::deviceRegistered, CC::generatePin, CC::registrationComplete)) != NULL) {
qDebug("Starting new wireless connection"); qDebug("Starting new wireless connection");
broadcast->setUnavailable();
processNewConnection(vita); processNewConnection(vita);
broadcast->setAvailable();
} else { } else {
mutex.lock(); mutex.lock();
if(in_progress) { if(in_progress) {
@@ -124,7 +126,6 @@ void CmaClient::processNewConnection(vita_device_t *device)
{ {
QMutexLocker locker(&mutex); QMutexLocker locker(&mutex);
in_progress = true; in_progress = true;
broadcast->setUnavailable();
qDebug("Vita connected: id %s", VitaMTP_Get_Identification(device)); qDebug("Vita connected: id %s", VitaMTP_Get_Identification(device));
DeviceCapability vita_info; DeviceCapability vita_info;
@@ -156,7 +157,6 @@ void CmaClient::processNewConnection(vita_device_t *device)
emit deviceDisconnected(); emit deviceDisconnected();
broadcast->setAvailable();
in_progress = false; in_progress = false;
sema.release(); sema.release();
} }

1
src/cmaclient.h
View File

@@ -54,7 +54,6 @@ private:
static int cancelCallback(); static int cancelCallback();
static void registrationComplete(); static void registrationComplete();
CmaBroadcast *broadcast;
Database *m_db; Database *m_db;
static QString tempOnlineId; static QString tempOnlineId;

2
src/qlistdb.cpp
View File

@@ -213,7 +213,7 @@ int QListDB::recursiveScanRootDirectory(root_list &list, CMAObject *parent, int
QDir dir(parent->path); QDir dir(parent->path);
dir.setSorting(QDir::Name | QDir::DirsFirst); dir.setSorting(QDir::Name | QDir::DirsFirst);
QFileInfoList qsl = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot); QFileInfoList qsl = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot, QDir::Time);
foreach(const QFileInfo &info, qsl) { foreach(const QFileInfo &info, qsl) {