Skip to content
This repository has been archived by the owner on Dec 6, 2021. It is now read-only.

Commit

Permalink
Fix can't update bug
Browse files Browse the repository at this point in the history
  • Loading branch information
icaros7 committed Nov 5, 2018
1 parent 504bd4a commit 22d3bf6
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 32 deletions.
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/source/Gamer_Clock/Gamer_Clock.csproj.user
/source/Gamer_Clock/bin
/source/Gamer_Clock/obj
/source/Gamer_Clock/bld
/source/Gamer_Clock/bin
/source/packages
/source/**/*.suo
*.user
*.log
source/.vs/Gamer_Clock/*
/source/**/**.csproj.user
/source/**/bin
/source/**/obj
/source/**/bld
/source/**/bin
/source/packages
/source/**/*.suo
*.user
*.log
source/.vs/**/*
Binary file modified Gamer Clock/Gamer_Clock.exe
Binary file not shown.
Binary file modified Gamer Clock/Gamer_Clock_Update.exe
Binary file not shown.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Gamer Clock for OSD 1.0.0.2
# Gamer Clock for OSD 1.0.0.3

## **English**
## Introduce
Expand Down Expand Up @@ -33,6 +33,9 @@ You can Update at "Option" Window. Just Click "Update" button. May be Gamer Cloc

## ChangeLog
---
### 1.0.0.3
- Fix can't update bug

### 1.0.0.2
- Prepare for github release
- Modified some URL for github release
Expand Down Expand Up @@ -78,6 +81,9 @@ Riva Turner 를 이용한 **게이머**를 위한 시계 입니다.

## 체인지로그
---
### 1.0.0.3
- 업데이트가 되지 않는 버그 수정

### 1.0.0.2
- github 릴리즈를 위한 소소한 변경
- github 릴리즈를 위한 배포 방식 변경으로 인한 일부 내부 URL 변경
Expand Down
5 changes: 2 additions & 3 deletions Source/Gamer_Clock/Form2.vb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ Public Class Form2

Private Sub Form2_Load(sender As Object, e As EventArgs) Handles MyBase.Load
CloseButton.Disable(Me)
My.Computer.Network.DownloadFile("https://github.com/icaros7/GamerClock/raw/master/Gamer%20Clock/Gamer_Clock.exe", "Gamer_Clock.exe")
Me.Location = Screen.AllScreens(My.Settings.Main_Monitor - 1).Bounds.Location + New Point(Screen.AllScreens(My.Settings.Main_Monitor - 1).WorkingArea.Width / 2 - Me.Width / 2, Screen.AllScreens(My.Settings.Main_Monitor - 1).WorkingArea.Height / 2 - Me.Height / 2)
Dim Cnt As Int32 = Screen.AllScreens.Length
Dim i As Int32 = 1
Expand Down Expand Up @@ -121,7 +120,7 @@ Public Class Form2
End Sub

Private Sub Cancel_btn_Click(sender As Object, e As EventArgs) Handles Cancel_btn.Click
Dim NoSave = MsgBox("저장 하지 않고 종료하시겠습니까?", vbExclamation + vbYesNoCancel, "취소")
Dim NoSave = MsgBox("저장 하지 않고 종료하시겠습니까?", vbExclamation + vbYesNo, "취소")
If NoSave = vbYes Then
Me.Hide()
End If
Expand All @@ -147,7 +146,7 @@ Public Class Form2

If MsgBox("새로운 업데이트가 있습니다. 설치 하시겠습니까?" + vbCrLf + vbCrLf + "설치된 버전 : " + CurrentVersion + vbCrLf + "최신 버전 : " + LastVersion, vbQuestion + vbYesNo, "업데이트") = vbYes Then
On Error GoTo UpdateError
My.Computer.Network.DownloadFile("https://github.com/icaros7/GamerClock/raw/master/Gamer%20Clock/Gamer_Clock.exe", "Gamer_Clock.exe")
Shell(Application.StartupPath + "\Gamer_Clock_Update.exe")
Else
MsgBox("가급적 최신 버전 사용을 권장합니다.", vbCritical, "안내")
Exit Sub
Expand Down
4 changes: 2 additions & 2 deletions Source/Gamer_Clock/Gamer_Clock.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<ProductName>Gamer Clock for OSD</ProductName>
<PublisherName>iHomin</PublisherName>
<SuiteName>Gamer Clock for OSD</SuiteName>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>1.0.0.2</ApplicationVersion>
<ApplicationRevision>3</ApplicationRevision>
<ApplicationVersion>1.0.0.3</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down
4 changes: 2 additions & 2 deletions Source/Gamer_Clock/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' 지정되도록 할 수 있습니다.
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.0.0.2")>
<Assembly: AssemblyFileVersion("1.0.0.2")>
<Assembly: AssemblyVersion("1.0.0.3")>
<Assembly: AssemblyFileVersion("1.0.0.3")>
5 changes: 5 additions & 0 deletions Source/Gamer_Clock_Update/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ static void Main(string[] args)
{
if (System.IO.File.Exists("Gamer_Clock.exe"))
{
foreach (var process in Process.GetProcessesByName("Gamer_Clock"))
{
process.Kill();
}
System.Threading.Thread.Sleep(1000);
System.IO.File.Delete("Gamer_Clock.exe");
WebClient we = new WebClient();
we.DownloadFile("https://raw.githubusercontent.com/icaros7/GamerClock/master/Gamer%20Clock/Gamer_Clock.exe", @"Gamer_Clock.exe");
Expand Down
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 22d3bf6

Please sign in to comment.