Skip to content

Commit

Permalink
Fix Install's UserControl, Remove Manifest check
Browse files Browse the repository at this point in the history
  • Loading branch information
MirisWisdom committed Feb 14, 2021
2 parents bcfdcda + 6346754 commit 52c77cf
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 23 deletions.
2 changes: 1 addition & 1 deletion hxe/kernel/src/HXE.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
9 changes: 3 additions & 6 deletions spv3/loader/src/Install.UserControl.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,9 @@ public partial class Install_UserControl : UserControl

public Install_UserControl()
{
if (System.IO.File.Exists(System.IO.Path.Combine(Paths.Packages(Environment.CurrentDirectory), HXE.Paths.Manifest)))
{
InitializeComponent();
_install = (Install) DataContext;
_install.Initialise();
}
InitializeComponent();
_install = (Install) DataContext;
_install.Initialise();
}

public event EventHandler Home;
Expand Down
14 changes: 0 additions & 14 deletions spv3/loader/src/Install.cs
Original file line number Diff line number Diff line change
Expand Up @@ -283,20 +283,6 @@ public void Initialise()
* Determine if the current environment fulfills the installation requirements.
*/

var manifest = (Manifest) Path.Combine(_source, HXE.Paths.Manifest);

if (manifest.Exists())
{
Status = "Waiting for user to install SPV3.";
CanInstall = true;
}
else
{
Status = "Could not find manifest in the data directory.";
CanInstall = false;
return;
}

if (Registry.GameExists("Custom")
|| Registry.GameExists("Retail")
|| ( Kernel.hxe.Tweaks.Patches & Patcher.EXEP.DISABLE_DRM_AND_KEY_CHECKS) == 1)
Expand Down
2 changes: 1 addition & 1 deletion spv3/loader/src/SPV3.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -28,7 +29,6 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
Expand Down
7 changes: 6 additions & 1 deletion spv3/updates/update.hxe
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
<Asset>
<URL>https://github.com/yumiris/HCE/releases/download/updates/credits.zip</URL>
<Name>credits.pdf</Name>
<Size>178846</Size>
<Size>581128</Size>
</Asset>
<Asset>
<URL>https://github.com/yumiris/HCE/releases/download/updates/readme.zip</URL>
<Name>readme.pdf</Name>
<Size>24781</Size>
</Asset>
<Asset>
<URL>https://github.com/yumiris/HCE/releases/download/updates/config.zip</URL>
Expand Down

0 comments on commit 52c77cf

Please sign in to comment.