MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-07 06:56:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

sanity check

Browse Source
This commit is contained in:
pypy
2021-01-09 14:28:13 +09:00
parent b74b678405
commit e24c71481e
2 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SQLite.cs
+9
View File
@@ -59,21 +59,30 @@ namespace VRCX
{ {
var values = new object[reader.FieldCount]; var values = new object[reader.FieldCount];
reader.GetValues(values); reader.GetValues(values);
if (callback.CanExecute == true)
{
callback.ExecuteAsync(null, values); callback.ExecuteAsync(null, values);
} }
} }
} }
}
if (callback.CanExecute == true)
{
callback.ExecuteAsync(null, null); callback.ExecuteAsync(null, null);
} }
}
finally finally
{ {
m_ConnectionLock.ExitReadLock(); m_ConnectionLock.ExitReadLock();
} }
} }
catch (Exception e) catch (Exception e)
{
if (callback.CanExecute == true)
{ {
callback.ExecuteAsync(e.Message, null); callback.ExecuteAsync(e.Message, null);
} }
}
callback.Dispose(); callback.Dispose();
} }
WebApi.cs
+11 -1
View File
@@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
using System.Windows.Forms;
namespace VRCX namespace VRCX
{ {
@@ -124,6 +125,8 @@ namespace VRCX
using (var response = await request.GetResponseAsync() as HttpWebResponse) using (var response = await request.GetResponseAsync() as HttpWebResponse)
using (var stream = response.GetResponseStream()) using (var stream = response.GetResponseStream())
using (var streamReader = new StreamReader(stream)) using (var streamReader = new StreamReader(stream))
{
if (callback.CanExecute == true)
{ {
callback.ExecuteAsync(null, new callback.ExecuteAsync(null, new
{ {
@@ -132,12 +135,15 @@ namespace VRCX
}); });
} }
} }
}
catch (WebException webException) catch (WebException webException)
{ {
if (webException.Response is HttpWebResponse response) if (webException.Response is HttpWebResponse response)
{ {
using (var stream = response.GetResponseStream()) using (var stream = response.GetResponseStream())
using (var streamReader = new StreamReader(stream)) using (var streamReader = new StreamReader(stream))
{
if (callback.CanExecute == true)
{ {
callback.ExecuteAsync(null, new callback.ExecuteAsync(null, new
{ {
@@ -146,17 +152,21 @@ namespace VRCX
}); });
} }
} }
else }
else if (callback.CanExecute == true)
{ {
callback.ExecuteAsync(webException.Message, null); callback.ExecuteAsync(webException.Message, null);
} }
} }
} }
catch (Exception e) catch (Exception e)
{
if (callback.CanExecute == true)
{ {
// FIXME: 브라우저는 종료되었는데 얘는 이후에 실행되면 터짐 // FIXME: 브라우저는 종료되었는데 얘는 이후에 실행되면 터짐
callback.ExecuteAsync(e.Message, null); callback.ExecuteAsync(e.Message, null);
} }
}
callback.Dispose(); callback.Dispose();
} }