ash/Anemone3DS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix misc. QR code bugs

Browse Source 
Close data->started properly, don't double close data->cancel
Should fix the QR code hang
This commit is contained in:
Alex Taber
2020-06-22 12:27:14 -04:00
parent 14d9e99b7d
commit 6a51b4eae5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/camera.c
View File

@@ -41,7 +41,7 @@ void exit_qr(qr_data *data)
DEBUG("Exiting QR\n"); DEBUG("Exiting QR\n");
svcSignalEvent(data->cancel); svcSignalEvent(data->cancel);
while(!data->finished) while(!data->finished)
svcSleepThread(1000000); svcSleepThread(1000000);
svcCloseHandle(data->cancel); svcCloseHandle(data->cancel);
data->capturing = false; data->capturing = false;
@@ -116,7 +116,7 @@ void capture_cam_thread(void *arg)
CAMU_Activate(SELECT_NONE); CAMU_Activate(SELECT_NONE);
camExit(); camExit();
free(buffer); free(buffer);
for(int i = 0; i < 3; i++) { for(int i = 1; i < 3; i++) {
if(events[i] != 0) { if(events[i] != 0) {
svcCloseHandle(events[i]); svcCloseHandle(events[i]);
events[i] = 0; events[i] = 0;
@@ -169,7 +169,10 @@ bool start_capture_cam(qr_data *data)
svcCreateEvent(&data->cancel, RESET_STICKY); svcCreateEvent(&data->cancel, RESET_STICKY);
svcCreateMutex(&data->mutex, false); svcCreateMutex(&data->mutex, false);
if(threadCreate(capture_cam_thread, data, 0x10000, 0x1A, 1, true) == NULL) if(threadCreate(capture_cam_thread, data, 0x10000, 0x1A, 1, true) == NULL)
{
throw_error("Capture cam thread creation failed\nPlease report this to the developers", ERROR_LEVEL_ERROR);
return false; return false;
}
svcWaitSynchronization(data->started, U64_MAX); svcWaitSynchronization(data->started, U64_MAX);
if(threadCreate(update_ui, data, 0x10000, 0x1A, 1, true) == NULL) if(threadCreate(update_ui, data, 0x10000, 0x1A, 1, true) == NULL)
{ {
@@ -327,6 +330,7 @@ bool init_qr(void)
while (!data->finished) update_qr(data); while (!data->finished) update_qr(data);
bool success = data->success; bool success = data->success;
while (!data->closed) svcSleepThread(1000000); while (!data->closed) svcSleepThread(1000000);
svcCloseHandle(data->started);
free(data); free(data);
return success; return success;