diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index ff9d5a1de..3bed32738 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -674,7 +674,6 @@ void FrameMain::LoadSubtitles (wxString filename,wxString charset) { // Setup bool isFile = !filename.empty(); - bool isBinary = false; // Load try { @@ -688,14 +687,11 @@ void FrameMain::LoadSubtitles (wxString filename,wxString charset) { // Make sure that file isn't actually a timecode file try { TextFileReader testSubs(filename,charset); - isBinary = testSubs.IsBinary(); - if (!isBinary && testSubs.HasMoreLines()) { - wxString cur = testSubs.ReadLineFromFile(); - if (cur.Left(10) == _T("# timecode")) { - LoadVFR(filename); - OPT_SET("Path/Last/Timecodes")->SetString(STD_STR(fileCheck.GetPath())); - return; - } + wxString cur = testSubs.ReadLineFromFile(); + if (cur.Left(10) == _T("# timecode")) { + LoadVFR(filename); + OPT_SET("Path/Last/Timecodes")->SetString(STD_STR(fileCheck.GetPath())); + return; } } catch (...) { @@ -742,7 +738,7 @@ void FrameMain::LoadSubtitles (wxString filename,wxString charset) { // Save copy wxFileName origfile(filename); - if (!isBinary && OPT_GET("App/Auto/Backup")->GetBool() && origfile.FileExists()) { + if (ass->CanSave() && OPT_GET("App/Auto/Backup")->GetBool() && origfile.FileExists()) { // Get path wxString path = lagi_wxString(OPT_GET("Path/Auto/Backup")->GetString()); if (path.IsEmpty()) path = origfile.GetPath(); diff --git a/aegisub/src/hotkeys.cpp b/aegisub/src/hotkeys.cpp index d19986ea6..065305aa3 100644 --- a/aegisub/src/hotkeys.cpp +++ b/aegisub/src/hotkeys.cpp @@ -276,11 +276,9 @@ void HotkeyManager::Load() { TextFileReader file(filename); wxString header; try { - if (!file.IsBinary()) - header = file.ReadLineFromFile(); + header = file.ReadLineFromFile(); } - catch (wxString e) { - header = _T(""); + catch (...) { } if (header != _T("[Hotkeys]")) { wxFileName backupfn(filename); diff --git a/aegisub/src/text_file_reader.cpp b/aegisub/src/text_file_reader.cpp index 4a291ab20..0c7910c63 100644 --- a/aegisub/src/text_file_reader.cpp +++ b/aegisub/src/text_file_reader.cpp @@ -55,13 +55,8 @@ TextFileReader::TextFileReader(wxString const& filename, wxString encoding, bool trim) : trim(trim) -, isBinary(false) { if (encoding.empty()) encoding = CharSetDetect::GetEncoding(filename); - if (encoding == L"binary") { - isBinary = true; - return; - } file.reset(agi::io::Open(STD_STR(filename))); iter = agi::line_iterator(*file, STD_STR(encoding)); } diff --git a/aegisub/src/text_file_reader.h b/aegisub/src/text_file_reader.h index 1a48461d7..64ef2bb17 100644 --- a/aegisub/src/text_file_reader.h +++ b/aegisub/src/text_file_reader.h @@ -51,7 +51,6 @@ class TextFileReader { std::auto_ptr file; bool trim; - bool isBinary; agi::line_iterator iter; TextFileReader(const TextFileReader&); @@ -71,5 +70,4 @@ public: wxString ReadLineFromFile(); /// @brief Check if there are any more lines to read bool HasMoreLines() const { return iter != agi::line_iterator(); } - bool IsBinary() const { return isBinary; } };