Skip to content
This repository has been archived by the owner on Mar 13, 2019. It is now read-only.

Commit

Permalink
-Added chromium as seperate package
Browse files Browse the repository at this point in the history
-Added download of chromium, if the package was not installed
-Fixed a bug where the start with BetaUpdate was not possible
  • Loading branch information
HeosSacer committed Jul 28, 2018
1 parent 3de257d commit 94d2972
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
10 changes: 0 additions & 10 deletions QBundle/My Project/Resources.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions QBundle/QBundle.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<IsWebBootstrapper>false</IsWebBootstrapper>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -28,8 +30,6 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -449,6 +449,7 @@
<Content Include="BurstLogo.ico" />
<Content Include="Changelog.txt" />
<Content Include="HowToUpgradeversion.txt" />
<Content Include="libcfx64.dll" />
<Content Include="Resources\blago.jpg" />
<None Include="Resources\CPUInstructions.exe" />
<None Include="Resources\Download.png" />
Expand Down
8 changes: 8 additions & 0 deletions QBundle/QBundle.vbproj.user
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,13 @@
</PropertyGroup>
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />
<ErrorReportUrlHistory />
<FallbackCulture>en-US</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion QBundle/clsAppManager.vb
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Public Class clsAppManager
Dim res As DialogResult
res = s.ShowDialog
If res = DialogResult.Cancel Then
Return True
Return False
ElseIf res = DialogResult.Abort Then
MsgBox("Something went wrong. Internet connection might have been lost.", MsgBoxStyle.Critical Or MsgBoxStyle.OkOnly, "Error")
Return False
Expand Down
2 changes: 1 addition & 1 deletion QBundle/frmMain.vb
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ Public Class frmMain
ChromiumWebBrowser.Initialize()
Catch ex As Chromium.CfxException
If Q.AppManager.InstallApp("chromium") Then
QB.Generic.RestartBundle()
Close()
Else
QB.Generic.RestartBundle()
Close()
End If
End Try
Expand Down

0 comments on commit 94d2972

Please sign in to comment.