razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #3147 from shun-iwasawa/g/fix_crash_on_copying_column

Browse source 
Fix Crash on Copying Column Connected to Plugin Fx
This commit is contained in:
Rodney 2020-03-30 08:59:26 -05:00 committed by GitHub
commit 5d6d967c5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toonz/sources/toonzqt/pluginhost.cpp
View file

@ -56,7 +56,7 @@ bool PluginLoader::load_entries(const std::string &basepath) {
if (!aw) {
aw = new PluginLoadController(basepath, NULL);
}
bool ret = aw->wait(16 /* ms */);
bool ret = aw->wait(16 /* ms */);
if (ret) aw = NULL; /* deleteLater で消えるはず */
return ret;
}
@ -152,7 +152,7 @@ PluginDescription::PluginDescription(const plugin_probe_t *const probe) {
}
RasterFxPluginHost::RasterFxPluginHost(PluginInformation *pinfo)
: TZeraryFx(), pi_(pinfo), user_data_(nullptr) {
: TRasterFx(), pi_(pinfo), user_data_(nullptr) {
pi_->add_ref();
}

2
toonz/sources/toonzqt/pluginhost.h
View file

@ -149,7 +149,7 @@ signals:
void start(const QString &filepath);
};
class RasterFxPluginHost final : public TZeraryFx, public TPluginInterface {
class RasterFxPluginHost final : public TRasterFx, public TPluginInterface {
PluginInformation *pi_;
std::vector<std::shared_ptr<TFxPort>> inputs_;