diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index 569f9eab1..c8e44854c 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -425,7 +425,7 @@ void FrameMain::LoadSubtitles(wxString filename,wxString charset) { /// @param saveas /// @param withCharset /// @return -bool FrameMain::SaveSubtitles(bool saveas, bool withCharset) { +bool FrameMain::SaveSubtitles(bool saveas) { wxString filename; if (!saveas && context->ass->CanSave()) { filename = context->ass->filename; @@ -441,14 +441,8 @@ bool FrameMain::SaveSubtitles(bool saveas, bool withCharset) { return false; } - wxString charset; - if (withCharset) { - charset = wxGetSingleChoice(_("Choose charset code:"), "Charset", agi::charset::GetEncodingsList(),this,-1, -1,true,250,200); - if (charset.empty()) return false; - } - try { - context->ass->Save(filename, true, true, charset); + context->ass->Save(filename, true, true); } catch (const agi::Exception& err) { wxMessageBox(lagi_wxString(err.GetMessage()), "Error", wxOK | wxICON_ERROR, NULL); diff --git a/aegisub/src/frame_main.h b/aegisub/src/frame_main.h index 825a5b37d..e771d6a1f 100644 --- a/aegisub/src/frame_main.h +++ b/aegisub/src/frame_main.h @@ -87,7 +87,7 @@ public: void StatusTimeout(wxString text,int ms=10000); void SetDisplayMode(int showVid,int showAudio); void LoadSubtitles(wxString filename,wxString charset=""); - bool SaveSubtitles(bool saveas=false,bool withCharset=false); + bool SaveSubtitles(bool saveas=false); void DetachVideo(bool detach=true); void LoadVFR(wxString filename);