X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.C;h=242c756850c9da2d917b4c53fa1b3c6b23d19fcf;hb=f676dacf9c69d8c906653f54d00342c01de6facf;hp=c73dd858e26058f8c2721273c0005b4406ff4989;hpb=a32d2c972f88e771a326e011bc16b6d38d6e9082;p=lyx.git

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index c73dd858e2..242c756850 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -346,6 +346,17 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 		disable = !Exporter::IsExportable(buf, "program");
 		break;
 
+	case LFUN_INSERTFOOTNOTE:
+	case LFUN_FOOTMELT:
+	case LFUN_MARGINMELT:
+		// Disable insertion of floats in a tabular.
+		disable = false;
+		if (owner->view()->theLockingInset()) {
+			disable = (owner->view()->theLockingInset()->LyxCode() == Inset::TABULAR_CODE) ||
+				owner->view()->theLockingInset()->GetFirstLockingInsetOfType(Inset::TABULAR_CODE);
+		}
+		break;
+
 	case LFUN_LAYOUT_TABULAR:
 		disable = true;
 		if (owner->view()->theLockingInset()) {