Skip to content

Presentation #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cymbre wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Presentation #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad1e4b5
fixed JsonProperties
Cymbre Jan 22, 2020
af07c6c
Option menu Dialog
Cymbre Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GameTracker-Agent/ViewModels/MainWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public void ExitProgram(object obj)
public void OpenOptions(object obj)
{
OptionWindow optionWindow = new OptionWindow();
optionWindow.Show();
optionWindow.ShowDialog();
Console.WriteLine("openOptions");
}

Expand Down
4 changes: 2 additions & 2 deletions GameTracker-Core/Models/Game.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ namespace GameTracker_Core.Models
[JsonObject(MemberSerialization.OptIn)]
public class Game
{
[JsonProperty("Name")]
[JsonProperty("gameName")]
private string _name;

[JsonProperty("Directory")]
[JsonProperty("gamePath")]
private string _directoryPath;


Expand Down