iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove AssFile::loaded since it isn't actually used for anything

This commit is contained in:
Thomas Goyne 2013-01-25 17:07:05 -08:00
parent 5092ab20c9
commit 9a146d1fc0
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
aegisub/src/ass_file.cpp
View File

@ -67,7 +67,6 @@ namespace std {
AssFile::AssFile ()
: commitId(0)
, loaded(false)
{
}
@ -109,7 +108,6 @@ void AssFile::Load(agi::fs::path const& filename, std::string const& charset) {
}
// Set general data
loaded = true;
this->filename = filename;
// Add comments and set vars
@ -145,7 +143,7 @@ void AssFile::Save(agi::fs::path const& filename, bool setfilename, bool addToRe
}
agi::fs::path AssFile::AutoSave() {
if (!loaded || commitId == autosavedCommitId)
if (commitId == autosavedCommitId)
return "";
auto path = StandardPaths::DecodePath(OPT_GET("Path/Auto/Save")->GetString());
@ -216,7 +214,6 @@ void AssFile::LoadDefault(bool defline) {
autosavedCommitId = savedCommitId = commitId + 1;
Commit("", COMMIT_NEW);
loaded = true;
StandardPaths::SetPathValue("?script", "");
FileOpen("");
}
@ -224,7 +221,6 @@ void AssFile::LoadDefault(bool defline) {
void AssFile::swap(AssFile &that) throw() {
// Intentionally does not swap undo stack related things
using std::swap;
swap(loaded, that.loaded);
swap(commitId, that.commitId);
swap(undoDescription, that.undoDescription);
swap(Line, that.Line);
@ -234,7 +230,6 @@ AssFile::AssFile(const AssFile &from)
: undoDescription(from.undoDescription)
, commitId(from.commitId)
, filename(from.filename)
, loaded(from.loaded)
{
Line.clone_from(from.Line, std::mem_fun_ref(&AssEntry::Clone), delete_ptr());
}

2
aegisub/src/ass_file.h
View File

@ -78,8 +78,6 @@ public:
EntryList Line;
/// The filename of this file, if any
agi::fs::path filename;
/// Is the file loaded?
bool loaded;
AssFile();
AssFile(const AssFile &from);

4
aegisub/src/frame_main.cpp
View File

@ -409,9 +409,7 @@ void FrameMain::InitContents() {
}
void FrameMain::LoadSubtitles(agi::fs::path const& filename, std::string const& charset) {
if (context->ass->loaded) {
if (TryToCloseSubs() == wxCANCEL) return;
}
if (TryToCloseSubs() == wxCANCEL) return;
try {
// Make sure that file isn't actually a timecode file