github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Opening a document via ‘mate -w’ and canceling would hang mate

Browse Source 
For example with the following command we get an encoding dialog that allows us to cancel opening of the document:

    echo Æblegrød|iconv -f utf-8 -t mac|mate -w
This commit is contained in:
Allan Odgaard
2014-11-11 08:54:35 +01:00
parent 24c510bbd5
commit 568fcd49cf
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Applications/TextMate/src/RMateServer.cc
View File

@@ -273,22 +273,33 @@ namespace // wrap in anonymous namespace to avoid clashing with other callbacks
WATCH_LEAKS(base_t);
virtual void save_document (document::document_ptr document) { }
virtual void close_document (document::document_ptr document) { }
virtual void close_document (document::document_t* document) { }
void document_will_delete (document::document_t* document)
{
close_and_delete(document);
}
void handle_document_event (document::document_ptr document, event_t event)
{
if(event == did_change_open_status && !document->is_open())
{
close_document(document);
D(DBF_RMateServer, bug("%p\n", this););
document->remove_callback(this);
delete this;
close_and_delete(document.get());
}
else if(event == did_save)
{
save_document(document);
}
}
private:
void close_and_delete (document::document_t* document)
{
document->remove_callback(this);
close_document(document);
delete this;
}
};
struct retain_temp_file_callback_t : base_t
@@ -319,7 +330,7 @@ namespace // wrap in anonymous namespace to avoid clashing with other callbacks
fprintf(stderr, "*** rmate: callback failed to save ‘%s’\n", document->display_name().c_str());
}
void close_document (document::document_ptr document)
void close_document (document::document_t* document)
{
D(DBF_RMateServer, bug("%s\n", document->path().c_str()););
bool res = true;
@@ -384,7 +395,7 @@ namespace // wrap in anonymous namespace to avoid clashing with other callbacks
document->add_callback(new reactivate_callback_t(*this));
}
void close_document (document::document_ptr document)
void close_document (document::document_t* document)
{
D(DBF_RMateServer, bug("%zu → %zu\n", *shared_count, *shared_count - 1););
if(--*shared_count == 0)