Improved 32-Bit vs. 64-Bit selection code for Avisynth/VapourSynth source.

[x264-launcher/x264-launcher.git] / src / source_avisynth.h

diff --git a/src/source_avisynth.h b/src/source_avisynth.h
index 9adc5a5..8e92529 100644 (file)
--- a/src/source_avisynth.h
+++ b/src/source_avisynth.h
@@ -49,6 +49,6 @@ protected:
        virtual void checkSourceProperties_init(QList<QRegExp*> &patterns, QStringList &cmdLine);
        virtual void checkSourceProperties_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &frames, unsigned int &fSizeW, unsigned int &fSizeH, unsigned int &fpsNom, unsigned int &fpsDen);
 
-       virtual QString getBinaryPath() const { return getSourceInfo().getBinaryPath(m_sysinfo, (m_sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64) && m_preferences->getPrefer64BitSource())); }
+       virtual QString getBinaryPath() const { return getSourceInfo().getBinaryPath(m_sysinfo, m_sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64) && m_sysinfo->getAvisynth(SysinfoModel::Avisynth_X64) && (m_preferences->getPrefer64BitSource() || (!m_sysinfo->getAvisynth(SysinfoModel::Avisynth_X86)))); }
        virtual void buildCommandLine(QStringList &cmdLine);
 };