Skip to content

Commit

Permalink
Fixed null exception when importing package template
Browse files Browse the repository at this point in the history
  • Loading branch information
cozy1 committed Dec 12, 2016
1 parent 7b2192c commit 5dc09db
Show file tree
Hide file tree
Showing 22 changed files with 6 additions and 3,543 deletions.
7 changes: 0 additions & 7 deletions RocksmithCustomSongCreator.sln
Expand Up @@ -70,8 +70,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ddc", "ddc", "{CB7159F6-4CF
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RocksmithToolkitUpdater", "RocksmithToolkitUpdater\RocksmithToolkitUpdater.csproj", "{4404D0DD-017E-4CC5-8302-3C150FDF06E7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "remastered", "RocksmithToolkitCLI\remastered\remastered.csproj", "{88A34EB4-10FE-495C-9A54-97DBBBA37D2D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Expand Down Expand Up @@ -135,10 +133,6 @@ Global
{4404D0DD-017E-4CC5-8302-3C150FDF06E7}.Debug|x86.Build.0 = Debug|x86
{4404D0DD-017E-4CC5-8302-3C150FDF06E7}.Release|x86.ActiveCfg = Release|x86
{4404D0DD-017E-4CC5-8302-3C150FDF06E7}.Release|x86.Build.0 = Release|x86
{88A34EB4-10FE-495C-9A54-97DBBBA37D2D}.Debug|x86.ActiveCfg = Debug|x86
{88A34EB4-10FE-495C-9A54-97DBBBA37D2D}.Debug|x86.Build.0 = Debug|x86
{88A34EB4-10FE-495C-9A54-97DBBBA37D2D}.Release|x86.ActiveCfg = Release|x86
{88A34EB4-10FE-495C-9A54-97DBBBA37D2D}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -155,7 +149,6 @@ Global
{ED268869-387A-477E-A652-C6E47BE2AC02} = {7CFB8499-8B82-40B3-89EA-7971F5FD1E0C}
{E742753F-9DC3-4AB7-B129-DC11EB2302CA} = {7CFB8499-8B82-40B3-89EA-7971F5FD1E0C}
{FE4E3BDA-2942-4009-9F42-07ECEF8DE350} = {7CFB8499-8B82-40B3-89EA-7971F5FD1E0C}
{88A34EB4-10FE-495C-9A54-97DBBBA37D2D} = {7CFB8499-8B82-40B3-89EA-7971F5FD1E0C}
{8BDB8985-CC6B-4479-A9A7-0489836D87CD} = {17ADB8C7-17DF-4BE3-8460-3E342F334B53}
{CB7159F6-4CF1-4296-A7EA-BCC4127C0441} = {17ADB8C7-17DF-4BE3-8460-3E342F334B53}
EndGlobalSection
Expand Down
7 changes: 5 additions & 2 deletions RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs
Expand Up @@ -209,7 +209,7 @@ public string AverageTempo
{ AverageTempoTB.Text = value.GetValidTempo(); }
}

public string PackageVersion
public string PackageVersion
{
get { return packageVersionTB.Text; }

Expand Down Expand Up @@ -1023,6 +1023,9 @@ private void FillPackageCreatorForm(DLCPackageData info, string filesBaseDir)
platformXBox360.Checked = info.XBox360;
platformPS3.Checked = info.PS3;

if (info.ToolkitInfo == null)
info.ToolkitInfo = new ToolkitInfo{PackageVersion = "1"};

PackageVersion = info.ToolkitInfo.PackageVersion;
PackageComment = info.ToolkitInfo.PackageComment;

Expand Down Expand Up @@ -1464,7 +1467,7 @@ private DLCPackageData GetPackageData()
ToolkitInfo = new ToolkitInfo
{
PackageVersion = PackageVersion.GetValidVersion(),
PackageComment = PackageComment
PackageComment = PackageComment
},

AlbumArtPath = AlbumArtPath,
Expand Down
Binary file modified RocksmithTookitGUI/Resources/BetaInfo.rtf
Binary file not shown.
4 changes: 0 additions & 4 deletions RocksmithTookitGUI/RocksmithToolkitGUI.csproj
Expand Up @@ -367,10 +367,6 @@
<Project>{822D185A-28A3-4AE0-A811-800E968AA2E7}</Project>
<Name>packer</Name>
</ProjectReference>
<ProjectReference Include="..\RocksmithToolkitCLI\remastered\remastered.csproj">
<Project>{88A34EB4-10FE-495C-9A54-97DBBBA37D2D}</Project>
<Name>remastered</Name>
</ProjectReference>
<ProjectReference Include="..\RocksmithToolkitCLI\sng2014\sng2014.csproj">
<Project>{8FDBC548-DEBF-46D6-A933-33C8D72F33AB}</Project>
<Name>sng2014</Name>
Expand Down
Binary file removed RocksmithToolkitCLI/remastered/CLI.ico
Binary file not shown.
713 changes: 0 additions & 713 deletions RocksmithToolkitCLI/remastered/Program.cs

This file was deleted.

0 comments on commit 5dc09db

Please sign in to comment.