aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaelTheShifter <[email protected]>2016-07-06 10:26:36 -0400
committerMichaelTheShifter <[email protected]>2016-07-06 10:26:36 -0400
commit62b4af3c2b4cf2b61fbb1626be5b3927b43f0f5b (patch)
tree84fc365c58632a9e5fcf0c6d89503280bb56d385
parent73ec1f27baf9441cbb4bba83599c4d9c467bf6a9 (diff)
downloadshiftos-c-_theultimatehacker-62b4af3c2b4cf2b61fbb1626be5b3927b43f0f5b.tar.gz
shiftos-c-_theultimatehacker-62b4af3c2b4cf2b61fbb1626be5b3927b43f0f5b.tar.bz2
shiftos-c-_theultimatehacker-62b4af3c2b4cf2b61fbb1626be5b3927b43f0f5b.zip
AppVeyor build test.
-rw-r--r--source/WindowsFormsApplication1/Engine/Lua_Interp.cs6
-rw-r--r--source/WindowsFormsApplication1/ShiftOS.csproj2
-rw-r--r--source/dependencies/NetSockets.dllbin0 -> 24576 bytes
3 files changed, 4 insertions, 4 deletions
diff --git a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs
index 529518e..bb76c77 100644
--- a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs
+++ b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs
@@ -186,12 +186,12 @@ namespace ShiftOS
WindowBorder b = null;
foreach(Control c in win.Controls)
{
- if ((string)c.Tag == "api_brdr")
- b = (WindowBorder)c;
+ if (c is WindowBorder)
+ b = c as WindowBorder;
}
return b;
});
-
+ mod.def_update = new Action(() => API.UpdateWindows());
mod.on_app_launcher_populate += new Action<ShiftOSDesktop, string>((desktop, func) =>
{
desktop.OnAppLauncherPopulate += (items) =>
diff --git a/source/WindowsFormsApplication1/ShiftOS.csproj b/source/WindowsFormsApplication1/ShiftOS.csproj
index dcae2c7..b835f29 100644
--- a/source/WindowsFormsApplication1/ShiftOS.csproj
+++ b/source/WindowsFormsApplication1/ShiftOS.csproj
@@ -56,7 +56,7 @@
<Private>True</Private>
</Reference>
<Reference Include="NetSockets">
- <HintPath>..\..\..\..\Downloads\NetSockets.dll</HintPath>
+ <HintPath>..\dependencies\NetSockets.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
diff --git a/source/dependencies/NetSockets.dll b/source/dependencies/NetSockets.dll
new file mode 100644
index 0000000..db2db50
--- /dev/null
+++ b/source/dependencies/NetSockets.dll
Binary files differ