Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-27 22:40:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix colon trim for type: null

Browse source 
y gamefreak
Closes #558
This commit is contained in:
Kurt 2016-12-02 20:05:11 -08:00
parent a60b0a8bca
commit 00d0dac85e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX/MainWindow/Main.cs
View file

@ -2970,7 +2970,8 @@ namespace PKHeX
// Create Temp File to Drag // Create Temp File to Drag
PKM pkx = preparePKM(); PKM pkx = preparePKM();
bool encrypt = ModifierKeys == Keys.Control; bool encrypt = ModifierKeys == Keys.Control;
string filename = $"{Path.GetFileNameWithoutExtension(pkx.FileName)}{(encrypt ? ".ek" + pkx.Format : "."+pkx.Extension) }"; string fn = pkx.FileName; fn = fn.Substring(0, fn.LastIndexOf('.'));
string filename = $"{fn}{(encrypt ? ".ek" + pkx.Format : "." + pkx.Extension)}";
byte[] dragdata = encrypt ? pkx.EncryptedBoxData : pkx.DecryptedBoxData; byte[] dragdata = encrypt ? pkx.EncryptedBoxData : pkx.DecryptedBoxData;
// Make file // Make file
string newfile = Path.Combine(Path.GetTempPath(), Util.CleanFileName(filename)); string newfile = Path.Combine(Path.GetTempPath(), Util.CleanFileName(filename));
@ -4055,7 +4056,8 @@ namespace PKHeX
byte[] dragdata = SAV.decryptPKM(DragInfo.slotPkmSource); byte[] dragdata = SAV.decryptPKM(DragInfo.slotPkmSource);
Array.Resize(ref dragdata, SAV.SIZE_STORED); Array.Resize(ref dragdata, SAV.SIZE_STORED);
PKM pkx = SAV.getPKM(dragdata); PKM pkx = SAV.getPKM(dragdata);
string filename = $"{Path.GetFileNameWithoutExtension(pkx.FileName)}{(encrypt ? ".ek" + pkx.Format : "." + pkx.Extension) }"; string fn = pkx.FileName; fn = fn.Substring(0, fn.LastIndexOf('.'));
string filename = $"{fn}{(encrypt ? ".ek" + pkx.Format : "." + pkx.Extension)}";
// Make File // Make File
string newfile = Path.Combine(Path.GetTempPath(), Util.CleanFileName(filename)); string newfile = Path.Combine(Path.GetTempPath(), Util.CleanFileName(filename));